Move initial remerge code over from thomcc/remerge

2019-10-29 13:23:07 -07:00 · 2019-10-29 13:23:07 -07:00 · 545a0e8489
--- a/Cargo.lock
+++ b/Cargo.lock
@ -23,7 +23,7 @@ dependencies = [

 [[package]]
 name = "anyhow"
-version = "1.0.23"
+version = "1.0.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
@ -50,7 +50,7 @@ name = "atty"
 version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -66,7 +66,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
 "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -76,7 +76,7 @@ version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -239,7 +239,7 @@ version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -276,7 +276,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -326,7 +326,7 @@ dependencies = [
 "clicolors-control 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "encode_unicode 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -370,7 +370,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -502,7 +502,7 @@ version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -534,7 +534,7 @@ name = "dirs"
 version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -639,7 +639,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
 "synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -702,7 +702,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
 "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "miniz_oxide 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -814,7 +814,7 @@ version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -832,7 +832,7 @@ dependencies = [
 "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
 "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "http 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
 "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -865,7 +865,7 @@ name = "hermit-abi"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -875,7 +875,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "http"
-version = "0.1.20"
+version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
@ -890,7 +890,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
 "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "http 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
 "tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -916,7 +916,7 @@ dependencies = [
 "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
 "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
- "http 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
 "http-body 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
@ -927,12 +927,12 @@ dependencies = [
 "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
 "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)",
 "tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
 "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "tokio-threadpool 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-timer 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
 "want 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -988,7 +988,7 @@ name = "iovec"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1028,7 +1028,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "libc"
-version = "0.2.65"
+version = "0.2.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
@ -1047,7 +1047,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
 "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1147,7 +1147,7 @@ name = "malloc_buf"
 version = "0.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1190,7 +1190,7 @@ name = "memchr"
 version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1225,14 +1225,15 @@ dependencies = [

 [[package]]
 name = "mio"
-version = "0.6.19"
+version = "0.6.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
 "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1271,7 +1272,7 @@ dependencies = [
 "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1312,7 +1313,7 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)",
 "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1334,7 +1335,7 @@ version = "0.2.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -1346,7 +1347,7 @@ dependencies = [
 "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
 "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -1405,7 +1406,7 @@ version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1461,7 +1462,7 @@ dependencies = [
 "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
 "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -1472,7 +1473,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "openssl-src"
-version = "111.6.0+1.1.1d"
+version = "111.6.1+1.1.1d"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1485,10 +1486,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-src 111.6.0+1.1.1d (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl-src 111.6.1+1.1.1d (registry+https://github.com/rust-lang/crates.io-index)",
 "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1523,7 +1524,7 @@ name = "parking_lot_core"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1537,7 +1538,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
 "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1612,7 +1613,7 @@ dependencies = [
 "sync15 0.1.0",
 "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "termion 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "termion 1.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "url_serde 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -1672,7 +1673,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1825,7 +1826,7 @@ version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1837,7 +1838,7 @@ version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1855,7 +1856,7 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1929,7 +1930,7 @@ name = "rand_jitter"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -1941,7 +1942,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2084,6 +2085,22 @@ name = "regex-syntax"
 version = "0.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"

+[[package]]
+name = "remerge"
+version = "0.1.0"
+dependencies = [
+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "remove_dir_all"
 version = "0.5.2"
@ -2104,7 +2121,7 @@ dependencies = [
 "encoding_rs 0.8.20 (registry+https://github.com/rust-lang/crates.io-index)",
 "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
 "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "http 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
 "hyper 0.12.35 (registry+https://github.com/rust-lang/crates.io-index)",
 "hyper-tls 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2116,10 +2133,10 @@ dependencies = [
 "serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
 "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
 "tokio-threadpool 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-timer 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
 "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2132,7 +2149,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "untrusted 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2223,7 +2240,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -2241,6 +2258,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -2263,7 +2281,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -2295,6 +2313,17 @@ dependencies = [
 "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

+[[package]]
+name = "serde_yaml"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
+ "yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "shlex"
 version = "0.1.1"
@ -2375,7 +2404,7 @@ dependencies = [
 "proc-macro-error 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -2390,7 +2419,7 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "1.0.8"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2493,7 +2522,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
 "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -2553,7 +2582,7 @@ version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
 "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2580,10 +2609,10 @@ dependencies = [

 [[package]]
 name = "termion"
-version = "1.5.3"
+version = "1.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
 "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2594,7 +2623,7 @@ name = "termios"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -2618,7 +2647,7 @@ name = "time"
 version = "0.1.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -2639,15 +2668,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
 "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
 "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
 "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "tokio-threadpool 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-timer 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -2666,12 +2695,12 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "tokio-executor"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2690,18 +2719,18 @@ dependencies = [

 [[package]]
 name = "tokio-reactor"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
 "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
 "tokio-sync 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -2723,9 +2752,9 @@ dependencies = [
 "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
 "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
 "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
 "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -2741,18 +2770,18 @@ dependencies = [
 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "tokio-timer"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
 "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -2864,7 +2893,7 @@ dependencies = [

 [[package]]
 name = "vcpkg"
-version = "0.2.7"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
@ -2950,7 +2979,7 @@ dependencies = [
 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
 "wasm-bindgen-shared 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -2970,7 +2999,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
 "wasm-bindgen-backend 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
 "wasm-bindgen-shared 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -2985,12 +3014,12 @@ name = "wasm-bindgen-webidl"
 version = "0.2.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "anyhow 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)",
+ "anyhow 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
 "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
 "wasm-bindgen-backend 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
 "weedle 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -3000,7 +3029,7 @@ name = "web-sys"
 version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "anyhow 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)",
+ "anyhow 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
 "js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
 "sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3030,7 +3059,7 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -3038,7 +3067,7 @@ name = "which"
 version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -3122,15 +3151,23 @@ name = "xcb"
 version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

+[[package]]
+name = "yaml-rust"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [metadata]
 "checksum adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2"
 "checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d"
 "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
-"checksum anyhow 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)" = "6f1072d8f55592084072d2d3cb23a4b680a8543c00f10d446118e85ad3718142"
+"checksum anyhow 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "9267dff192e68f3399525901e709a48c1d3982c9c072fa32f2127a0cb0babf14"
 "checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee"
 "checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
 "checksum assert-json-diff 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9881d306dee755eccf052d652b774a6b2861e86b4772f555262130e58e4f81d2"
@ -3217,7 +3254,7 @@ dependencies = [
 "checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
 "checksum hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "307c3c9f937f38e3534b1d6447ecf090cafcc9744e4a6360e8b037b2cf5af120"
 "checksum hex 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "023b39be39e3a2da62a94feb433e91e8bcd37676fbc8bea371daf52b7a769a3e"
-"checksum http 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "2790658cddc82e82b08e25176c431d7015a0adeb1718498715cbd20138a0bf68"
+"checksum http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)" = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0"
 "checksum http-body 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d"
 "checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
 "checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
@ -3232,7 +3269,7 @@ dependencies = [
 "checksum js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)" = "1c840fdb2167497b0bd0db43d6dfe61e91637fa72f9d061f8bd17ddc44ba6414"
 "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
 "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-"checksum libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)" = "1a31a0627fdf1f6a39ec0dd577e101440b7db22672c0901fe00a9a6fbb5c24e8"
+"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
 "checksum libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753"
 "checksum libsqlite3-sys 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5e5b95e89c330291768dc840238db7f9e204fd208511ab6319b56193a7f2ae25"
 "checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83"
@ -3248,7 +3285,7 @@ dependencies = [
 "checksum mime 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "dd1d63acd1b78403cc0c325605908475dd9b9a3acbf65ed8bcab97e27014afcf"
 "checksum mime_guess 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1a0ed03949aef72dbdf3116a383d7b38b4768e6f960528cd6a6044aa9ed68599"
 "checksum miniz_oxide 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6f3f74f726ae935c3f514300cc6773a0c9492abc5e972d42ba0c0ebb88757625"
-"checksum mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)" = "83f51996a3ed004ef184e16818edc51fadffe8e7ca68be67f9dee67d84d0ff23"
+"checksum mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)" = "302dec22bcf6bae6dfb69c647187f4b4d0fb6f535521f7bc022430ce8e12008f"
 "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
 "checksum mockiato 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)" = "32ab84f0c1bf24789b915accc69d662674a87df893f38fd08c36375acdbcf83c"
 "checksum mockiato-codegen 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)" = "1d0ea1407c509b9cf6e0eb0d92e97063b24dd73d5a2f12c49c40ee209f15594b"
@ -3272,7 +3309,7 @@ dependencies = [
 "checksum once_cell 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "891f486f630e5c5a4916c7e16c4b24a53e78c860b646e9f8e005e4f16847bfed"
 "checksum openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)" = "3a3cc5799d98e1088141b8e01ff760112bbd9f19d850c124500566ca6901a585"
 "checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
-"checksum openssl-src 111.6.0+1.1.1d (registry+https://github.com/rust-lang/crates.io-index)" = "b9c2da1de8a7a3f860919c01540b03a6db16de042405a8a07a5e9d0b4b825d9c"
+"checksum openssl-src 111.6.1+1.1.1d (registry+https://github.com/rust-lang/crates.io-index)" = "c91b04cb43c1a8a90e934e0cd612e2a5715d976d2d6cff4490278a0cddf35005"
 "checksum openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)" = "465d16ae7fc0e313318f7de5cecf57b2fbe7511fd213978b457e1c96ff46736f"
 "checksum output_vt100 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53cdc5b785b7a58c5aad8216b3dfa114df64b0b06ae6e1501cef91df2fbdf8f9"
 "checksum parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337"
@ -3346,6 +3383,7 @@ dependencies = [
 "checksum serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)" = "1a3351dcbc1f067e2c92ab7c3c1f288ad1a4cffc470b5aaddb4c2e0a3ae80043"
 "checksum serde_test 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)" = "c52f24dbb54cfb71ab54c48177354e7ae8cdbfb125fc5b126d0653be34e9e31b"
 "checksum serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a"
+"checksum serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)" = "691b17f19fc1ec9d94ec0b5864859290dff279dbd7b03f017afda54eb36c3c35"
 "checksum shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
 "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
 "checksum smallbitvec 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b17a69077f717ddbf4945f16c34df16a0a251909c6b7c4a45bccdb4d377bf02b"
@ -3358,13 +3396,13 @@ dependencies = [
 "checksum structopt 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "30b3a3e93f5ad553c38b3301c8a0a0cec829a36783f6a0c467fc4bf553a5f5bf"
 "checksum structopt-derive 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea692d40005b3ceba90a9fe7a78fa8d4b82b0ce627eebbffc329aab850f3410e"
 "checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
-"checksum syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "661641ea2aa15845cddeb97dad000d22070bb5c1fb456b96c1cba883ec691e92"
+"checksum syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "dff0acdb207ae2fe6d5976617f887eb1e35a2ba52c13c7234c790960cdad9238"
 "checksum synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545"
 "checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
 "checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
 "checksum term 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42"
 "checksum termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e"
-"checksum termion 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6a8fb22f7cde82c8220e5aeacb3258ed7ce996142c77cba193f203515e26c330"
+"checksum termion 1.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "818ef3700c2a7b447dca1a1dd28341fe635e6ee103c806c636bb9c929991b2cd"
 "checksum termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "72b620c5ea021d75a735c943269bb07d30c9b77d6ac6b236bc8b5c496ef05625"
 "checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
 "checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
@ -3373,13 +3411,13 @@ dependencies = [
 "checksum tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)" = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6"
 "checksum tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46"
 "checksum tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d16217cad7f1b840c5a97dfb3c43b0c871fef423a6e8d2118c604e843662a443"
-"checksum tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "0f27ee0e6db01c5f0b2973824547ce7e637b2ed79b891a9677b0de9bd532b6ac"
+"checksum tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "ca6df436c42b0c3330a82d855d2ef017cd793090ad550a6bc2184f4b933532ab"
 "checksum tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5090db468dad16e1a7a54c8c67280c5e4b544f3d3e018f0b913b400261f85926"
-"checksum tokio-reactor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "c56391be9805bc80163151c0b9e5164ee64f4b0200962c346fea12773158f22d"
+"checksum tokio-reactor 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "6732fe6b53c8d11178dcb77ac6d9682af27fc6d4cb87789449152e5377377146"
 "checksum tokio-sync 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "d06554cce1ae4a50f42fba8023918afa931413aded705b560e29600ccf7c6d76"
 "checksum tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119"
 "checksum tokio-threadpool 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "2bd2c6a3885302581f4401c82af70d792bb9df1700e7437b0aeb4ada94d5388c"
-"checksum tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "f2106812d500ed25a4f38235b9cae8f78a09edf43203e16e59c3b769a342a60e"
+"checksum tokio-timer 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)" = "1739638e364e558128461fc1ad84d997702c8e31c2e6b18fb99842268199e827"
 "checksum toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf"
 "checksum try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382"
 "checksum try_from 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "283d3b89e1368717881a9d51dad843cc435380d8109c9e47d38780a324698d8b"
@ -3395,7 +3433,7 @@ dependencies = [
 "checksum url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "75b414f6c464c879d7f9babf951f23bc3743fb7313c081b2e6ca719067ea9d61"
 "checksum url_serde 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "74e7d099f1ee52f823d4bdd60c93c3602043c728f5db3b97bdb548467f7bddea"
 "checksum uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a"
-"checksum vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "33dd455d0f96e90a75803cfeb7f948768c08d70a6de9a8d2362461935698bf95"
+"checksum vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168"
 "checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
 "checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
 "checksum version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce"
@ -3426,3 +3464,4 @@ dependencies = [
 "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
 "checksum x11-clipboard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "89bd49c06c9eb5d98e6ba6536cf64ac9f7ee3a009b2f53996d405b3944f6bcea"
 "checksum xcb 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5e917a3f24142e9ff8be2414e36c649d47d6cc2ba81f16201cdef96e533e02de"
+"checksum yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "65923dd1784f44da1d2c3dbbc5e822045628c590ba72123e1c73d3c230c4434d"
--- a/Cargo.toml
+++ b/Cargo.toml
@ -9,6 +9,7 @@ members = [
    "components/push",
    "components/push/ffi",
    "components/rc_log",
+    "components/remerge",
    "components/support/cli",
    "components/support/error",
    "components/support/ffi",
--- a/components/remerge/Cargo.toml
+++ b/components/remerge/Cargo.toml
@ -0,0 +1,21 @@
+[package]
+name = "remerge"
+version = "0.1.0"
+authors = ["Thom Chiovoloni <tchiovoloni@mozilla.com>"]
+edition = "2018"
+license = "MPL-2.0"
+
+[dependencies]
+serde = { version = "1.0.102", features = ["derive"] }
+failure = { version = "0.1.6" }
+url = "2.1.0"
+serde_json = "1.0.41"
+log = "0.4.8"
+semver = { version = "0.9.0", features = ["serde"] }
+lazy_static = "1.4.0"
+serde_yaml = "0.8.11"
+# it's not clear if we should actually use these deps (they're fine and not
+# uncommon or anything, but we could avoid them at the cost of slightly more
+# code).
+matches = "0.1.8"
+num-traits = "0.2.8"
--- a/components/remerge/src/lib.rs
+++ b/components/remerge/src/lib.rs
@ -0,0 +1,4 @@
+#[macro_use]
+mod util;
+
+pub mod schema;
--- a/components/remerge/src/schema/desc.rs
+++ b/components/remerge/src/schema/desc.rs
@ -0,0 +1,238 @@
+/* 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 super::merge_kinds::*;
+use serde::{Deserialize, Serialize};
+use serde_json::Value as JsonValue;
+use std::collections::HashMap;
+use url::Url;
+
+/// The set of features understood by this client.
+pub const REMERGE_FEATURES_UNDERSTOOD: &[&str] = &["record_set", "untyped_map"];
+
+pub type JsonObject = serde_json::Map<String, JsonValue>;
+pub type FieldIndex = usize;
+
+#[derive(Clone, Debug, PartialEq)]
+pub struct RecordSchema {
+    pub version: semver::Version,
+    pub required_version: semver::VersionReq,
+
+    pub remerge_features_used: Vec<String>,
+
+    pub legacy: bool,
+    pub fields: Vec<Field>,
+    pub field_map: HashMap<String, FieldIndex>,
+
+    pub dedupe_on: Vec<FieldIndex>,
+
+    pub composite_roots: Vec<FieldIndex>,
+    pub composite_fields: Vec<FieldIndex>,
+
+    // If we have a semantic for an UpdatedAt Timestamp, it's this.
+    pub field_updated_at: Option<FieldIndex>,
+
+    // If we have an own_guid field, it's this.
+    pub field_own_guid: Option<FieldIndex>,
+}
+
+#[derive(Clone, Debug, PartialEq, PartialOrd)]
+pub enum CompositeInfo {
+    Member { root: FieldIndex },
+    Root { children: Vec<FieldIndex> },
+}
+
+/// A single field in a record.
+#[derive(Clone, Debug, PartialEq)]
+pub struct Field {
+    pub name: String,
+    pub local_name: String,
+
+    pub required: bool,
+    pub deprecated: bool,
+
+    pub change_preference: Option<ChangePreference>,
+    pub composite: Option<CompositeInfo>,
+
+    /// The type-specific information about a field.
+    pub ty: FieldType,
+    pub own_idx: FieldIndex,
+}
+
+#[derive(Clone, Debug, PartialEq)]
+pub enum FieldType {
+    Untyped {
+        merge: UntypedMerge,
+        default: Option<JsonValue>,
+    },
+
+    Text {
+        merge: TextMerge,
+        default: Option<String>,
+    },
+
+    Url {
+        merge: TextMerge,
+        is_origin: bool,
+        default: Option<Url>,
+    },
+
+    Number {
+        merge: NumberMerge,
+        min: Option<f64>,
+        max: Option<f64>,
+        if_out_of_bounds: IfOutOfBounds,
+        default: Option<f64>,
+    },
+
+    Integer {
+        merge: NumberMerge,
+        min: Option<i64>,
+        max: Option<i64>,
+        if_out_of_bounds: IfOutOfBounds,
+        default: Option<i64>,
+    },
+
+    Timestamp {
+        merge: TimestampMerge,
+        semantic: Option<TimestampSemantic>,
+        default: Option<TimestampDefault>,
+    },
+
+    Boolean {
+        merge: BooleanMerge,
+        default: Option<bool>,
+    },
+
+    OwnGuid {
+        auto: bool,
+    },
+
+    UntypedMap {
+        prefer_deletions: bool,
+        default: Option<JsonObject>,
+    },
+
+    RecordSet {
+        id_key: String,
+        prefer_deletions: bool,
+        default: Option<Vec<JsonObject>>,
+    },
+}
+
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub enum TimestampSemantic {
+    CreatedAt,
+    UpdatedAt,
+}
+
+impl std::fmt::Display for TimestampSemantic {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            TimestampSemantic::CreatedAt => f.write_str("created_at"),
+            TimestampSemantic::UpdatedAt => f.write_str("updated_at"),
+        }
+    }
+}
+
+impl TimestampSemantic {
+    pub fn required_merge(self) -> TimestampMerge {
+        match self {
+            TimestampSemantic::CreatedAt => TimestampMerge::TakeMin,
+            TimestampSemantic::UpdatedAt => TimestampMerge::TakeMax,
+        }
+    }
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub enum ChangePreference {
+    #[serde(rename = "missing")]
+    Missing,
+
+    #[serde(rename = "present")]
+    Present,
+}
+
+// We handle serialization specially.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
+pub enum TimestampDefault {
+    Value(i64),
+    Now,
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub enum FieldKind {
+    Untyped,
+    Text,
+    Url,
+    Number,
+    Integer,
+    Timestamp,
+    Boolean,
+    OwnGuid,
+    UntypedMap,
+    RecordSet,
+}
+
+impl std::fmt::Display for FieldKind {
+    #[inline]
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        f.write_str(match self {
+            FieldKind::Untyped => "untyped",
+            FieldKind::Text => "text",
+            FieldKind::Url => "url",
+            FieldKind::Number => "number",
+            FieldKind::Integer => "integer",
+            FieldKind::Timestamp => "timestamp",
+            FieldKind::Boolean => "boolean",
+            FieldKind::OwnGuid => "own_guid",
+            FieldKind::UntypedMap => "untyped_map",
+            FieldKind::RecordSet => "record_set",
+        })
+    }
+}
+
+impl FieldType {
+    pub fn is_kind(&self, k: FieldKind) -> bool {
+        match self {
+            FieldType::Untyped { .. } => k == FieldKind::Untyped,
+            FieldType::Text { .. } => k == FieldKind::Text,
+            FieldType::Url { .. } => k == FieldKind::Url,
+
+            FieldType::Number { .. } => k == FieldKind::Number,
+            FieldType::Integer { .. } => k == FieldKind::Integer,
+            FieldType::Timestamp { .. } => k == FieldKind::Timestamp,
+
+            FieldType::Boolean { .. } => k == FieldKind::Boolean,
+            FieldType::OwnGuid { .. } => k == FieldKind::OwnGuid,
+            FieldType::UntypedMap { .. } => k == FieldKind::UntypedMap,
+            FieldType::RecordSet { .. } => k == FieldKind::RecordSet,
+        }
+    }
+
+    pub fn uses_untyped_merge(&self, um: UntypedMerge) -> bool {
+        match self {
+            // These branches must be separate since many of the `merge`s
+            // have diff. types, but they all impl PartialEq<UntypedMerge>.
+            FieldType::Untyped { merge, .. } => &um == merge,
+            FieldType::Text { merge, .. } | FieldType::Url { merge, .. } => &um == merge,
+            FieldType::Number { merge, .. } | FieldType::Integer { merge, .. } => &um == merge,
+            FieldType::Timestamp { merge, .. } => &um == merge,
+            FieldType::Boolean { merge, .. } => &um == merge,
+
+            // List these out so new additions need to update this.
+            FieldType::OwnGuid { .. }
+            | FieldType::UntypedMap { .. }
+            | FieldType::RecordSet { .. } => false,
+        }
+    }
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, PartialOrd, serde::Serialize, serde::Deserialize)]
+pub enum IfOutOfBounds {
+    #[serde(rename = "clamp")]
+    Clamp,
+    #[serde(rename = "discard")]
+    Discard,
+}
--- a/components/remerge/src/schema/error.rs
+++ b/components/remerge/src/schema/error.rs
@ -0,0 +1,214 @@
+/* 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 super::desc::*;
+use super::merge_kinds::*;
+use super::yaml::ParsedMerge;
+use failure::Fail;
+
+#[derive(Debug, Clone, Fail)]
+pub enum FieldError {
+    #[fail(display = "Record field names must be ascii, nonempty, and contain [a-zA-Z0-9_$]")]
+    InvalidName,
+
+    #[fail(
+        display = "Merge strategy '{:?}' and type '{:?}' are not compatible.",
+        ty, merge
+    )]
+    IllegalMergeForType { ty: FieldKind, merge: ParsedMerge },
+
+    #[fail(display = "Composite fields may not specify a merge strategy")]
+    CompositeFieldMergeStrat,
+
+    #[fail(display = "Cannot find composite_root '{}'", _0)]
+    UnknownCompositeRoot(String),
+
+    #[fail(display = "Field of type '{}' may not be part of dedupe_on", _0)]
+    BadTypeInDedupeOn(FieldKind),
+
+    #[fail(display = "Invalid merge strategy for composite root: {}", _0)]
+    CompositeRootInvalidMergeStrat(ParsedMerge),
+
+    #[fail(display = "Fields of type '{}' may not specify a merge strategy", _0)]
+    TypeForbidsMergeStrat(FieldKind),
+
+    #[fail(display = "Fields of type '{}' may not be part of a composite", _0)]
+    TypeNotComposite(FieldKind),
+
+    #[fail(display = "\"deprecated\" and \"required\" may not both be true on a field'")]
+    DeprecatedRequiredConflict,
+
+    #[fail(display = "Missing `if_out_of_bounds` on bounded number")]
+    NoBoundsCheckInfo,
+
+    #[fail(display = "Bounded number max/min are not finite, or 'max' value is less than 'min'.")]
+    BadNumBounds,
+
+    #[fail(display = "Default value for bounded number is not inside the bounds")]
+    BadNumDefault,
+
+    #[fail(display = "Composite roots may not have numeric clamping (discard is allowed)")]
+    NumberClampOnCompositeRoot,
+
+    #[fail(display = "A field's composite root cannot be part of a composite")]
+    CompositeRecursion,
+
+    #[fail(
+        display = "Invalid URL \"{}\" as default value of `url` field: {}",
+        _0, _1
+    )]
+    BadDefaultUrl(String, url::ParseError),
+
+    #[fail(
+        display = "is_origin URL field has default value of \"{}\", which isn't an origin",
+        _0
+    )]
+    BadDefaultOrigin(String),
+
+    #[fail(
+        display = "Semantic timestamp '{}' must use the '{}' merge strategy (got '{}').",
+        sem, want, got
+    )]
+    BadMergeForTimestampSemantic {
+        sem: TimestampSemantic,
+        want: TimestampMerge,
+        got: TimestampMerge,
+    },
+
+    #[fail(display = "{}", _0)]
+    LazyCatchall(String),
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+pub enum SemverProp {
+    Version,
+    RequiredVersion,
+}
+
+impl std::fmt::Display for SemverProp {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            SemverProp::Version => f.write_str("version"),
+            SemverProp::RequiredVersion => f.write_str("required_version"),
+        }
+    }
+}
+
+#[derive(Debug, Fail)]
+pub enum SchemaError {
+    #[fail(display = "Schema format error: {}", _0)]
+    FormatError(#[fail(cause)] serde_yaml::Error),
+
+    #[fail(display = "Cannot parse format_version: {}", _0)]
+    WrongFormatVersion(usize),
+
+    #[fail(
+        display = "Failed to parse semantic version string {:?} from property '{}': {}",
+        got, prop, err
+    )]
+    VersionParseFailed {
+        prop: SemverProp,
+        got: String,
+        #[fail(cause)]
+        err: semver::SemVerError,
+    },
+
+    #[fail(
+        display = "Failed to parse semantic version requirement {:?} from property '{}': {}",
+        got, prop, err
+    )]
+    VersionReqParseFailed {
+        prop: SemverProp,
+        got: String,
+        #[fail(cause)]
+        err: semver::ReqParseError,
+    },
+
+    #[fail(
+        display = "Schema required_version '{}' and version '{}' are not compatible.",
+        _0, _1
+    )]
+    LocalRequiredVersionNotCompatible(semver::VersionReq, semver::Version),
+
+    #[fail(
+        display = "Remerge feature {} is required but not supported locally",
+        _0
+    )]
+    MissingRemergeFeature(String),
+    #[fail(
+        display = "Remerge feature {} is required but not listed in remerge_features_used",
+        _0
+    )]
+    UndeclaredFeatureRequired(String),
+
+    #[fail(display = "Duplicate field: {}", _0)]
+    DuplicateField(String),
+
+    #[fail(display = "Field '{}': {}", _0, _1)]
+    FieldError(String, #[fail(cause)] FieldError),
+
+    #[fail(
+        display = "Composite root '{}' has an illegal type / merge combination",
+        _0
+    )]
+    IllegalCompositeRoot(String),
+
+    #[fail(
+        display = "A record with a non-empty dedupe_on list may not use the `duplicate` merge strategy"
+    )]
+    DedupeOnWithDuplicateField,
+
+    #[fail(display = "Unknown field in dedupe_on: {}", _0)]
+    UnknownDedupeOnField(String),
+
+    #[fail(display = "Deprecated field in dedupe_on: {}", _0)]
+    DeprecatedFieldDedupeOn(String),
+
+    #[fail(display = "Only part of a composite field appears in dedupe_on")]
+    PartialCompositeDedupeOn,
+
+    #[fail(display = "Legacy collections must have an `OwnId` field.")]
+    LegacyMissingId,
+
+    #[fail(display = "Only one field with the 'updated_at' timestamp semantic is allowed")]
+    MultipleUpdateAt,
+
+    #[fail(display = "Only one 'own_guid' field is allowd")]
+    MultipleOwnGuid,
+
+    #[fail(display = "Remote schema missing 'remerge_features_used'")]
+    RemoteMissingRemergeFeaturesUsed,
+
+    #[fail(
+        display = "'required_remerge_version' specified locally (as \"{}\"), but it's greater than our actual version \"{}\"",
+        _0, _1
+    )]
+    LocalRemergeVersionFailsLocalRequired(semver::VersionReq, semver::Version),
+
+    #[fail(display = "'remerge_version' can not be specified locally.")]
+    LocalRemergeVersionSpecified,
+
+    #[fail(
+        display = "Locked out of remote schema since our remerge_version \"{}\" is not compatible with requirement \"{}\"",
+        version, req
+    )]
+    LocalRemergeVersionFailsRemoteRequired {
+        version: semver::Version,
+        req: semver::VersionReq,
+    },
+
+    #[fail(
+        display = "Remote remerge_version \"{}\" is not compatible with its own listed requirement \"{}\"",
+        version, req
+    )]
+    RemoteRemergeVersionFailsOwnRequirement {
+        version: semver::Version,
+        req: semver::VersionReq,
+    },
+
+    #[fail(display = "{}", _0)]
+    LazyCatchall(String),
+}
+
+pub type SchemaResult<T> = std::result::Result<T, SchemaError>;
--- a/components/remerge/src/schema/merge_kinds.rs
+++ b/components/remerge/src/schema/merge_kinds.rs
@ -0,0 +1,240 @@
+/* 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/. */
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
+pub enum UntypedMerge {
+    TakeNewest,
+    PreferRemote,
+    Duplicate,
+    CompositeMember,
+}
+
+impl std::fmt::Display for UntypedMerge {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            UntypedMerge::TakeNewest => f.write_str("take_newest"),
+            UntypedMerge::PreferRemote => f.write_str("prefer_remote"),
+            UntypedMerge::Duplicate => f.write_str("duplicate"),
+            UntypedMerge::CompositeMember => f.write_str("<composite member>"),
+        }
+    }
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
+pub enum TextMerge {
+    Untyped(UntypedMerge),
+}
+
+impl std::fmt::Display for TextMerge {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            TextMerge::Untyped(u) => write!(f, "{}", u),
+        }
+    }
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
+pub enum TimestampMerge {
+    Untyped(UntypedMerge),
+    TakeMin,
+    TakeMax,
+}
+
+impl std::fmt::Display for TimestampMerge {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            TimestampMerge::Untyped(u) => write!(f, "{}", u),
+            TimestampMerge::TakeMin => f.write_str("take_min"),
+            TimestampMerge::TakeMax => f.write_str("take_max"),
+        }
+    }
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
+pub enum NumberMerge {
+    Untyped(UntypedMerge),
+    TakeMin,
+    TakeMax,
+    TakeSum,
+}
+
+impl std::fmt::Display for NumberMerge {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            NumberMerge::Untyped(u) => write!(f, "{}", u),
+            NumberMerge::TakeMin => f.write_str("take_min"),
+            NumberMerge::TakeMax => f.write_str("take_max"),
+            NumberMerge::TakeSum => f.write_str("take_sum"),
+        }
+    }
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
+pub enum BooleanMerge {
+    Untyped(UntypedMerge),
+    PreferFalse,
+    PreferTrue,
+}
+
+impl std::fmt::Display for BooleanMerge {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            BooleanMerge::Untyped(u) => write!(f, "{}", u),
+            BooleanMerge::PreferFalse => f.write_str("prefer_false"),
+            BooleanMerge::PreferTrue => f.write_str("prefer_true"),
+        }
+    }
+}
+
+// macro to remove boilerplate
+macro_rules! merge_boilerplate {
+    // base case.
+    (@type [$MergeT:ident]) => {
+    };
+
+    // @common_methods: implement an common_methods method returning Option<UntypedMerge>
+    (@type [$MergeT:ident] @common_methods $($tt:tt)*) => {
+        impl $MergeT {
+            pub fn as_untyped(&self) -> Option<UntypedMerge> {
+                #[allow(unreachable_patterns)]
+                match self {
+                    $MergeT::Untyped(u) => Some(*u),
+                    _ => None
+                }
+            }
+            pub fn is_composite_member(&self) -> bool {
+                self.as_untyped() == Some(UntypedMerge::CompositeMember)
+            }
+        }
+        merge_boilerplate!(@type [$MergeT] $($tt)*);
+    };
+
+    // @from_untyped: impl From<Untyped> for $MergeT
+    (@type [$MergeT:ident] @from_untyped $($tt:tt)+) => {
+        impl From<UntypedMerge> for $MergeT {
+            #[inline]
+            fn from(u: UntypedMerge) -> Self {
+                $MergeT::Untyped(u)
+            }
+        }
+        merge_boilerplate!(@type [$MergeT] $($tt)+);
+    };
+
+    // @compare_untyped : implement PartialEq<UntypedMerge> automatically.
+    (@type [$MergeT:ident] @compare_untyped $($tt:tt)*) => {
+        impl PartialEq<UntypedMerge> for $MergeT {
+            #[inline]
+            fn eq(&self, o: &UntypedMerge) -> bool {
+                #[allow(unreachable_patterns)]
+                match self {
+                    $MergeT::Untyped(u) => u == o,
+                    _ => false,
+                }
+            }
+        }
+        impl PartialEq<$MergeT> for UntypedMerge {
+            #[inline]
+            fn eq(&self, o: &$MergeT) -> bool {
+                o == self
+            }
+        }
+        merge_boilerplate!(@type [$MergeT] $($tt)*);
+    };
+
+    // @compare_via_untyped [$T0, ...], implement PartialEq<$T0> for $MergeT, assuming
+    // that $T0 and $MergeT only overlap in UntypedMerge impls.
+    (@type [$MergeT:ident] @compare_via_untyped [$($T0:ident),* $(,)?] $($tt:tt)*) => {
+        $(
+            impl PartialEq<$T0> for $MergeT {
+                fn eq(&self, o: &$T0) -> bool {
+                    #[allow(unreachable_patterns)]
+                    match (self, o) {
+                        ($MergeT::Untyped(self_u), $T0::Untyped(t0_u)) => self_u == t0_u,
+                        _ => false
+                    }
+                }
+            }
+            impl PartialEq<$MergeT> for $T0 {
+                fn eq(&self, o: &$MergeT) -> bool {
+                    PartialEq::eq(o, self)
+                }
+            }
+        )*
+
+        merge_boilerplate!(
+            @type [$MergeT]
+            $($tt)*
+        );
+    };
+
+    // @compare_with [SomeTy { Enums, Vals, That, Are, The, Same }]
+    (@type [$MergeT:ident] @compare_with [$T0:ident { $($Variant:ident),+ $(,)? }] $($tt:tt)*) => {
+        impl PartialEq<$T0> for $MergeT {
+            #[inline]
+            fn eq(&self, o: &$T0) -> bool {
+                #[allow(unreachable_patterns)]
+                match (self, o) {
+                    ($MergeT::Untyped(self_u), $T0::Untyped(t0_u)) => self_u == t0_u,
+                    $(($MergeT::$Variant, $T0::$Variant) => true,)+
+                    _ => false
+                }
+            }
+        }
+
+        impl PartialEq<$MergeT> for $T0 {
+            #[inline]
+            fn eq(&self, o: &$MergeT) -> bool {
+                o == self
+            }
+        }
+
+        merge_boilerplate!(@type [$MergeT] $($tt)*);
+    };
+
+    // @from [SomeEnum { Variants, That, Are, The, Same }]
+    (@type [$MergeT:ident] @from [$T0:ident { $($Variant:ident),+ $(,)? }] $($tt:tt)*) => {
+        impl From<$T0> for $MergeT {
+            fn from(t: TimestampMerge) -> Self {
+                match t {
+                    $T0::Untyped(u) => $MergeT::Untyped(u),
+                    $($T0::$Variant => $MergeT::$Variant,)+
+                }
+            }
+        }
+        merge_boilerplate!(@type [$MergeT] $($tt)*);
+    }
+}
+
+merge_boilerplate!(
+    @type [BooleanMerge]
+    @from_untyped
+    @common_methods
+    @compare_untyped
+    @compare_via_untyped [NumberMerge, TextMerge, TimestampMerge]
+);
+
+merge_boilerplate!(
+    @type [TextMerge]
+    @from_untyped
+    @common_methods
+    @compare_untyped
+    @compare_via_untyped [NumberMerge, TimestampMerge]
+);
+
+merge_boilerplate!(
+    @type [NumberMerge]
+    @from_untyped
+    @common_methods
+    @compare_untyped
+    @compare_via_untyped []
+    @compare_with [TimestampMerge { TakeMax, TakeMin }]
+    @from [TimestampMerge { TakeMax, TakeMin }]
+);
+
+merge_boilerplate!(
+    @type [TimestampMerge]
+    @from_untyped
+    @common_methods
+    @compare_untyped
+);
--- a/components/remerge/src/schema/mod.rs
+++ b/components/remerge/src/schema/mod.rs
@ -0,0 +1,14 @@
+/* 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 desc;
+
+pub mod error;
+pub mod merge_kinds;
+pub mod yaml;
+
+pub use desc::*;
+pub use error::SchemaError;
+pub use merge_kinds::*;
+pub use yaml::parse_from_string;
--- a/components/remerge/src/schema/yaml.rs
+++ b/components/remerge/src/schema/yaml.rs
--- a/components/remerge/src/util.rs
+++ b/components/remerge/src/util.rs
@ -0,0 +1,49 @@
+/* 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/. */
+
+/// For use with `#[serde(skip_serializing_if = )]`
+#[inline]
+pub fn is_default<T: PartialEq + Default>(v: &T) -> bool {
+    *v == T::default()
+}
+
+/// Returns true if the byte `b` is a valid base64url byte.
+#[inline]
+#[rustfmt::skip]
+pub fn is_base64url_byte(b: u8) -> bool {
+    // For some reason, if this is indented the way rustfmt wants,
+    // the next time this file is opened, VSCode deduces it *must*
+    // actually use 8 space indent, and converts the whole file on
+    // save. This is a VSCode bug, but is really annoying, so I'm
+    // just preventing rustfmt from reformatting this to avoid it.
+    (b'A' <= b && b <= b'Z') ||
+    (b'a' <= b && b <= b'z') ||
+    (b'0' <= b && b <= b'9') ||
+    b == b'-' ||
+    b == b'_'
+}
+
+/// Return with the provided Err(error) after invoking Into conversions
+#[macro_export]
+macro_rules! throw {
+    ($e:expr) => {{
+        log::error!("Error: {}", $e);
+        return Err(::std::convert::Into::into($e));
+    }};
+}
+
+/// Like assert! but with `throw!` and not `panic!`.
+#[macro_export]
+macro_rules! ensure {
+    ($cond:expr, $e:expr) => {
+        if !($cond) {
+            log::warn!(concat!("Ensure ", stringify!($cond), " failed!"));
+            throw!($e)
+        }
+    };
+}
+
+/// Release of WorldWideWeb, the first web browser. Synced data could never come
+/// from before this date. XXX this could be untrue for new collections...
+pub const EARLIEST_SANE_TIME: i64 = 662_083_200_000;