diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e7c50509d26..b1b9ab259ac 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -170,8 +170,8 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions-rs/toolchain@v1
         with:
-          # 1.60 is the cfg-expr version
-          toolchain: 1.64.0
+          # 1.65 is the cfg-expr version
+          toolchain: 1.65.0
           override: true
       - uses: Swatinem/rust-cache@v2
       - name: Build and test
diff --git a/Cargo.lock b/Cargo.lock
index b81ae963eb7..1a71af7ae50 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -359,9 +359,9 @@ dependencies = [
 
 [[package]]
 name = "cfg-expr"
-version = "0.11.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0357a6402b295ca3a86bc148e84df46c02e41f41fef186bda662557ef6328aa"
+checksum = "0bbc13bf6290a6b202cc3efb36f7ec2b739a80634215630c8053a313edf6abef"
 dependencies = [
  "smallvec",
  "target-lexicon",
@@ -2180,9 +2180,9 @@ dependencies = [
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.4"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c02424087780c9b71cc96799eaeddff35af2bc513278cda5c99fc1f5d026d3c1"
+checksum = "9410d0f6853b1d94f0e519fb95df60f29d2c1eff2d921ffdf01a4c8a3b54f12d"
 
 [[package]]
 name = "target-spec"
diff --git a/fixtures/guppy/hakari/metadata_guppy_44b62fa-0.toml b/fixtures/guppy/hakari/metadata_guppy_44b62fa-0.toml
index 1d85ad0dbcc..2161e3f0ce9 100644
--- a/fixtures/guppy/hakari/metadata_guppy_44b62fa-0.toml
+++ b/fixtures/guppy/hakari/metadata_guppy_44b62fa-0.toml
@@ -6,7 +6,7 @@
 # unify-target-host = 'unify-if-both'
 # output-single-feature = false
 # dep-format-version = '2'
-# platforms = ['powerpc-wrs-vxworks', 'thumbv7neon-linux-androideabi']
+# platforms = ['powerpc-wrs-vxworks', 'thumbv7m-none-eabi']
 # [[traversal-excludes.ids]]
 # name = 'cargo-compare'
 # version = '0.1.0'
diff --git a/fixtures/guppy/hakari/metadata_guppy_44b62fa-2.toml b/fixtures/guppy/hakari/metadata_guppy_44b62fa-2.toml
index 39aa8ef1303..77f8f9584b7 100644
--- a/fixtures/guppy/hakari/metadata_guppy_44b62fa-2.toml
+++ b/fixtures/guppy/hakari/metadata_guppy_44b62fa-2.toml
@@ -6,7 +6,7 @@
 # unify-target-host = 'replicate-target-on-host'
 # output-single-feature = true
 # dep-format-version = '2'
-# platforms = ['aarch64-unknown-freebsd', 'armv7-unknown-freebsd']
+# platforms = ['aarch64-unknown-freebsd', 'armv7-linux-androideabi']
 #
 # [traversal-excludes]
 # [[final-excludes.ids]]
diff --git a/fixtures/guppy/hakari/metadata_guppy_78cb7e8-1.toml b/fixtures/guppy/hakari/metadata_guppy_78cb7e8-1.toml
index 4eee9a350f9..fb4b24a8835 100644
--- a/fixtures/guppy/hakari/metadata_guppy_78cb7e8-1.toml
+++ b/fixtures/guppy/hakari/metadata_guppy_78cb7e8-1.toml
@@ -6,7 +6,7 @@
 # unify-target-host = 'none'
 # output-single-feature = false
 # dep-format-version = '2'
-# platforms = ['powerpc-wrs-vxworks', 'riscv64gc-unknown-linux-gnu', 'mipsel-unknown-none']
+# platforms = ['powerpc-wrs-vxworks-spe', 'riscv64gc-unknown-freebsd', 'mipsel-unknown-none']
 # [[traversal-excludes.ids]]
 # name = 'pathdiff'
 # version = '0.2.0'
@@ -59,16 +59,16 @@ proc-macro2 = { version = "1", features = ["proc-macro"] }
 quote = { version = "1", features = ["proc-macro"] }
 syn = { version = "1", features = ["clone-impls", "derive", "full", "parsing", "printing", "proc-macro", "quote", "visit"] }
 
-[target.powerpc-wrs-vxworks.dependencies]
+[target.powerpc-wrs-vxworks-spe.dependencies]
 libc = { version = "0.2", features = ["std"] }
 
-[target.powerpc-wrs-vxworks.build-dependencies]
+[target.powerpc-wrs-vxworks-spe.build-dependencies]
 libc = { version = "0.2", features = ["std"] }
 
-[target.riscv64gc-unknown-linux-gnu.dependencies]
+[target.riscv64gc-unknown-freebsd.dependencies]
 libc = { version = "0.2", features = ["std"] }
 
-[target.riscv64gc-unknown-linux-gnu.build-dependencies]
+[target.riscv64gc-unknown-freebsd.build-dependencies]
 libc = { version = "0.2", features = ["std"] }
 
 ### END HAKARI SECTION
diff --git a/fixtures/guppy/hakari/metadata_guppy_78cb7e8-3.toml b/fixtures/guppy/hakari/metadata_guppy_78cb7e8-3.toml
index 6050d1cbb09..d63c8e4dded 100644
--- a/fixtures/guppy/hakari/metadata_guppy_78cb7e8-3.toml
+++ b/fixtures/guppy/hakari/metadata_guppy_78cb7e8-3.toml
@@ -6,7 +6,7 @@
 # unify-target-host = 'auto'
 # output-single-feature = false
 # dep-format-version = '2'
-# platforms = ['powerpc-unknown-freebsd', 'x86_64-unknown-redox', 'aarch64-uwp-windows-msvc']
+# platforms = ['powerpc-unknown-freebsd', 'x86_64-unknown-redox', 'aarch64-wrs-vxworks']
 # [[traversal-excludes.ids]]
 # name = 'fixtures'
 # version = '0.1.0'
@@ -86,8 +86,11 @@ libc = { version = "0.2", features = ["std"] }
 [target.x86_64-unknown-redox.build-dependencies]
 libc = { version = "0.2", features = ["std"] }
 
-[target.aarch64-uwp-windows-msvc.dependencies]
-winapi = { version = "0.3", default-features = false, features = ["basetsd", "consoleapi", "errhandlingapi", "fileapi", "handleapi", "ioapiset", "jobapi", "jobapi2", "libloaderapi", "lmcons", "memoryapi", "minschannel", "minwinbase", "minwindef", "namedpipeapi", "ntdef", "ntstatus", "processenv", "processthreadsapi", "profileapi", "psapi", "schannel", "securitybaseapi", "shellapi", "shlobj", "sspi", "std", "synchapi", "sysinfoapi", "timezoneapi", "winbase", "wincon", "wincrypt", "winerror", "winnt", "winsock2", "winuser", "ws2def", "ws2ipdef", "ws2tcpip"] }
+[target.aarch64-wrs-vxworks.dependencies]
+libc = { version = "0.2", features = ["std"] }
+
+[target.aarch64-wrs-vxworks.build-dependencies]
+libc = { version = "0.2", features = ["std"] }
 
 ### END HAKARI SECTION
 
diff --git a/fixtures/guppy/hakari/metadata_guppy_869476c-1.toml b/fixtures/guppy/hakari/metadata_guppy_869476c-1.toml
index be744aac45e..c33b53fb07e 100644
--- a/fixtures/guppy/hakari/metadata_guppy_869476c-1.toml
+++ b/fixtures/guppy/hakari/metadata_guppy_869476c-1.toml
@@ -6,7 +6,7 @@
 # unify-target-host = 'none'
 # output-single-feature = true
 # dep-format-version = '2'
-# platforms = ['wasm64-unknown-unknown']
+# platforms = ['wasm32-wasi']
 # [[traversal-excludes.ids]]
 # name = 'byteorder'
 # version = '1.3.4'
@@ -197,11 +197,28 @@ unicode-xid-c65f7effa3be6d31 = { package = "unicode-xid", version = "0.1" }
 unicode-xid-6f8ce4dd05d13bba = { package = "unicode-xid", version = "0.2" }
 version_check = { version = "0.9", default-features = false }
 
-[target.wasm64-unknown-unknown.dependencies]
+[target.wasm32-wasi.dependencies]
+adler = { version = "0.2", default-features = false }
 foreign-types = { version = "0.3", default-features = false }
 foreign-types-shared = { version = "0.1", default-features = false }
+js-sys = { version = "0.3", default-features = false }
+miniz_oxide = { version = "0.4", default-features = false }
 openssl = { version = "0.10", default-features = false }
 openssl-sys = { version = "0.9", default-features = false }
+wasi-93f6ce9d446188ac = { package = "wasi", version = "0.10", features = ["std"] }
+wasi-274715c4dabd11b0 = { package = "wasi", version = "0.9", features = ["std"] }
+wasm-bindgen = { version = "0.2", features = ["spans", "std"] }
+web-sys = { version = "0.3", default-features = false, features = ["CanvasRenderingContext2d", "Document", "DomRect", "DomRectReadOnly", "Element", "EventTarget", "HtmlCanvasElement", "HtmlElement", "Node", "Window"] }
+
+[target.wasm32-wasi.build-dependencies]
+bumpalo = { version = "3" }
+cfg-if = { version = "0.1", default-features = false }
+lazy_static = { version = "1", default-features = false }
+log = { version = "0.4", default-features = false }
+wasm-bindgen-backend = { version = "0.2", default-features = false, features = ["spans"] }
+wasm-bindgen-macro = { version = "0.2", default-features = false, features = ["spans"] }
+wasm-bindgen-macro-support = { version = "0.2", default-features = false, features = ["spans"] }
+wasm-bindgen-shared = { version = "0.2", default-features = false }
 
 ### END HAKARI SECTION
 
diff --git a/fixtures/guppy/hakari/metadata_guppy_869476c-3.toml b/fixtures/guppy/hakari/metadata_guppy_869476c-3.toml
index 3cdc17b990d..8d2c887371a 100644
--- a/fixtures/guppy/hakari/metadata_guppy_869476c-3.toml
+++ b/fixtures/guppy/hakari/metadata_guppy_869476c-3.toml
@@ -6,7 +6,7 @@
 # unify-target-host = 'replicate-target-on-host'
 # output-single-feature = true
 # dep-format-version = '2'
-# platforms = ['aarch64-wrs-vxworks']
+# platforms = ['aarch64_be-unknown-linux-gnu']
 # [[traversal-excludes.ids]]
 # name = 'openssl'
 # version = '0.10.30'
@@ -356,12 +356,12 @@ void = { version = "1", default-features = false }
 wait-timeout = { version = "0.2", default-features = false }
 walkdir = { version = "2", default-features = false }
 
-[target.aarch64-wrs-vxworks.dependencies]
+[target.aarch64_be-unknown-linux-gnu.dependencies]
 openssl-probe = { version = "0.1", default-features = false }
 openssl-sys = { version = "0.9", default-features = false }
 termios = { version = "0.3", default-features = false }
 
-[target.aarch64-wrs-vxworks.build-dependencies]
+[target.aarch64_be-unknown-linux-gnu.build-dependencies]
 openssl-probe = { version = "0.1", default-features = false }
 openssl-sys = { version = "0.9", default-features = false }
 termios = { version = "0.3", default-features = false }
diff --git a/fixtures/guppy/hakari/metadata_guppy_c9b4f76-3.toml b/fixtures/guppy/hakari/metadata_guppy_c9b4f76-3.toml
index bba5397ca3d..8021ed6d6ad 100644
--- a/fixtures/guppy/hakari/metadata_guppy_c9b4f76-3.toml
+++ b/fixtures/guppy/hakari/metadata_guppy_c9b4f76-3.toml
@@ -6,7 +6,7 @@
 # unify-target-host = 'auto'
 # output-single-feature = true
 # dep-format-version = '2'
-# platforms = ['aarch64-nintendo-switch-freestanding', 'i686-unknown-linux-gnu', 'x86_64-unknown-l4re-uclibc']
+# platforms = ['aarch64-nintendo-switch-freestanding', 'i686-unknown-haiku', 'x86_64-unknown-illumos']
 # [[traversal-excludes.ids]]
 # name = 'cargo-compare'
 # version = '0.1.0'
@@ -145,12 +145,12 @@ version_check = { version = "0.9", default-features = false }
 ppv-lite86 = { version = "0.2", default-features = false, features = ["simd", "std"] }
 rand_chacha = { version = "0.2", default-features = false, features = ["std"] }
 
-[target.i686-unknown-linux-gnu.dependencies]
+[target.i686-unknown-haiku.dependencies]
 ppv-lite86 = { version = "0.2", default-features = false, features = ["simd", "std"] }
 rand_chacha = { version = "0.2", default-features = false, features = ["std"] }
 termios = { version = "0.3", default-features = false }
 
-[target.x86_64-unknown-l4re-uclibc.dependencies]
+[target.x86_64-unknown-illumos.dependencies]
 ppv-lite86 = { version = "0.2", default-features = false, features = ["simd", "std"] }
 rand_chacha = { version = "0.2", default-features = false, features = ["std"] }
 termios = { version = "0.3", default-features = false }
diff --git a/fixtures/guppy/summaries/metadata_guppy_44b62fa-0.toml b/fixtures/guppy/summaries/metadata_guppy_44b62fa-0.toml
index d6819a98931..e3e7e223604 100644
--- a/fixtures/guppy/summaries/metadata_guppy_44b62fa-0.toml
+++ b/fixtures/guppy/summaries/metadata_guppy_44b62fa-0.toml
@@ -7,7 +7,7 @@ include-dev = true
 initials-platform = 'standard'
 
 [metadata.host-platform]
-triple = 'aarch64_be-unknown-linux-gnu_ilp32'
+triple = 'arm-linux-androideabi'
 target-features = 'unknown'
 flags = ['foo']
 
diff --git a/fixtures/guppy/summaries/metadata_guppy_44b62fa-3.toml b/fixtures/guppy/summaries/metadata_guppy_44b62fa-3.toml
index 7a14778f445..e8a4e9f6040 100644
--- a/fixtures/guppy/summaries/metadata_guppy_44b62fa-3.toml
+++ b/fixtures/guppy/summaries/metadata_guppy_44b62fa-3.toml
@@ -12,7 +12,7 @@ target-features = ['sse2', 'sse3']
 flags = ['abc', 'cargo_web']
 
 [metadata.target-platform]
-triple = 'x86_64-apple-tvos'
+triple = 'x86_64-apple-ios-macabi'
 target-features = 'unknown'
 flags = ['foo']
 
diff --git a/fixtures/guppy/summaries/metadata_guppy_44b62fa-6.toml b/fixtures/guppy/summaries/metadata_guppy_44b62fa-6.toml
index 369f69b605c..d813d97ff60 100644
--- a/fixtures/guppy/summaries/metadata_guppy_44b62fa-6.toml
+++ b/fixtures/guppy/summaries/metadata_guppy_44b62fa-6.toml
@@ -7,7 +7,7 @@ include-dev = false
 initials-platform = 'host'
 
 [metadata.host-platform]
-triple = 'arm-unknown-linux-musleabihf'
+triple = 'arm64_32-apple-watchos'
 target-features = 'unknown'
 flags = ['bar', 'cargo_web']
 
diff --git a/fixtures/guppy/summaries/metadata_guppy_78cb7e8-0.toml b/fixtures/guppy/summaries/metadata_guppy_78cb7e8-0.toml
index d773357cf08..b997580f92c 100644
--- a/fixtures/guppy/summaries/metadata_guppy_78cb7e8-0.toml
+++ b/fixtures/guppy/summaries/metadata_guppy_78cb7e8-0.toml
@@ -10,7 +10,7 @@ initials-platform = 'host'
 spec = 'always'
 
 [metadata.target-platform]
-triple = 'asmjs-unknown-emscripten'
+triple = 'armv7s-apple-ios'
 target-features = ['bmi1', 'sse3', 'sse4.2']
 
 [[host-package]]
diff --git a/fixtures/guppy/summaries/metadata_guppy_78cb7e8-3.toml b/fixtures/guppy/summaries/metadata_guppy_78cb7e8-3.toml
index fc687b7a88c..cbab16774e4 100644
--- a/fixtures/guppy/summaries/metadata_guppy_78cb7e8-3.toml
+++ b/fixtures/guppy/summaries/metadata_guppy_78cb7e8-3.toml
@@ -10,7 +10,7 @@ initials-platform = 'proc-macros-on-target'
 spec = 'always'
 
 [metadata.target-platform]
-triple = 'armv7-unknown-linux-gnueabi'
+triple = 'armv7-unknown-freebsd'
 target-features = 'unknown'
 flags = ['bar', 'foo']
 [[metadata.omitted-packages.ids]]
diff --git a/fixtures/guppy/summaries/metadata_guppy_78cb7e8-6.toml b/fixtures/guppy/summaries/metadata_guppy_78cb7e8-6.toml
index 80c66cb15fb..72c4daeae47 100644
--- a/fixtures/guppy/summaries/metadata_guppy_78cb7e8-6.toml
+++ b/fixtures/guppy/summaries/metadata_guppy_78cb7e8-6.toml
@@ -7,7 +7,7 @@ include-dev = true
 initials-platform = 'standard'
 
 [metadata.host-platform]
-triple = 'thumbv6m-none-eabi'
+triple = 'thumbv4t-none-eabi'
 target-features = ['aes', 'bmi1', 'xsaves']
 flags = ['foo']
 
diff --git a/fixtures/guppy/summaries/metadata_guppy_869476c-1.toml b/fixtures/guppy/summaries/metadata_guppy_869476c-1.toml
index a1ca41b13f1..e1e96f93c93 100644
--- a/fixtures/guppy/summaries/metadata_guppy_869476c-1.toml
+++ b/fixtures/guppy/summaries/metadata_guppy_869476c-1.toml
@@ -7,7 +7,7 @@ include-dev = false
 initials-platform = 'proc-macros-on-target'
 
 [metadata.host-platform]
-triple = 'riscv64imac-unknown-none-elf'
+triple = 'riscv64gc-unknown-openbsd'
 target-features = ['avx', 'bmi2', 'rdrand', 'sse', 'sse2']
 flags = ['abc', 'test-flag']
 
@@ -1115,6 +1115,13 @@ crates-io = true
 status = 'transitive'
 features = []
 
+[[host-package]]
+name = 'libc'
+version = '0.2.79'
+crates-io = true
+status = 'transitive'
+features = ['default', 'std']
+
 [[host-package]]
 name = 'pkg-config'
 version = '0.3.18'
diff --git a/fixtures/guppy/summaries/metadata_guppy_c9b4f76-2.toml b/fixtures/guppy/summaries/metadata_guppy_c9b4f76-2.toml
index fd2d92d936a..ea984f61a32 100644
--- a/fixtures/guppy/summaries/metadata_guppy_c9b4f76-2.toml
+++ b/fixtures/guppy/summaries/metadata_guppy_c9b4f76-2.toml
@@ -10,7 +10,7 @@ initials-platform = 'standard'
 spec = 'any'
 
 [metadata.target-platform]
-triple = 'aarch64-pc-windows-msvc'
+triple = 'aarch64-unknown-freebsd'
 target-features = ['avx2', 'sha', 'sse2', 'sse3']
 flags = ['test-flag']
 [[metadata.omitted-packages.ids]]
@@ -151,7 +151,7 @@ version = '2.33.3'
 crates-io = true
 status = 'direct'
 features = ['ansi_term', 'atty', 'color', 'default', 'strsim', 'suggestions', 'vec_map']
-optional-deps = ['atty', 'strsim', 'vec_map']
+optional-deps = ['ansi_term', 'atty', 'strsim', 'vec_map']
 
 [[target-package]]
 name = 'criterion'
@@ -408,7 +408,7 @@ version = '0.4.19'
 crates-io = true
 status = 'transitive'
 features = ['clock', 'default', 'libc', 'oldtime', 'std', 'time', 'winapi']
-optional-deps = ['libc', 'time', 'winapi']
+optional-deps = ['libc', 'time']
 
 [[target-package]]
 name = 'combine'
@@ -423,7 +423,7 @@ version = '0.11.3'
 crates-io = true
 status = 'transitive'
 features = ['ansi-parsing', 'default', 'regex', 'unicode-width', 'winapi-util', 'windows-console-colors']
-optional-deps = ['regex', 'unicode-width', 'winapi-util']
+optional-deps = ['regex', 'unicode-width']
 
 [[target-package]]
 name = 'crates-io'
@@ -503,6 +503,7 @@ version = '0.4.33'
 crates-io = true
 status = 'transitive'
 features = ['default', 'http2', 'openssl-probe', 'openssl-sys', 'ssl']
+optional-deps = ['openssl-probe', 'openssl-sys']
 
 [[target-package]]
 name = 'curl-sys'
@@ -510,7 +511,7 @@ version = '0.4.36+curl-7.71.1'
 crates-io = true
 status = 'transitive'
 features = ['default', 'http2', 'libnghttp2-sys', 'openssl-sys', 'ssl']
-optional-deps = ['libnghttp2-sys']
+optional-deps = ['libnghttp2-sys', 'openssl-sys']
 
 [[target-package]]
 name = 'difference'
@@ -519,13 +520,6 @@ crates-io = true
 status = 'transitive'
 features = ['default']
 
-[[target-package]]
-name = 'encode_unicode'
-version = '0.3.6'
-crates-io = true
-status = 'transitive'
-features = ['default', 'std']
-
 [[target-package]]
 name = 'env_logger'
 version = '0.7.1'
@@ -557,8 +551,15 @@ status = 'transitive'
 features = ['default', 'std']
 
 [[target-package]]
-name = 'fwdansi'
-version = '1.1.0'
+name = 'foreign-types'
+version = '0.3.2'
+crates-io = true
+status = 'transitive'
+features = []
+
+[[target-package]]
+name = 'foreign-types-shared'
+version = '0.1.1'
 crates-io = true
 status = 'transitive'
 features = []
@@ -576,6 +577,7 @@ version = '0.13.11'
 crates-io = true
 status = 'transitive'
 features = ['default', 'https', 'openssl-probe', 'openssl-sys', 'ssh', 'ssh_key_from_memory']
+optional-deps = ['openssl-probe', 'openssl-sys']
 
 [[target-package]]
 name = 'git2-curl'
@@ -716,7 +718,7 @@ version = '0.12.13+1.0.1'
 crates-io = true
 status = 'transitive'
 features = ['https', 'libssh2-sys', 'openssl-sys', 'ssh', 'ssh_key_from_memory']
-optional-deps = ['libssh2-sys']
+optional-deps = ['libssh2-sys', 'openssl-sys']
 
 [[target-package]]
 name = 'libnghttp2-sys'
@@ -782,13 +784,6 @@ crates-io = true
 status = 'transitive'
 features = ['default']
 
-[[target-package]]
-name = 'miow'
-version = '0.3.5'
-crates-io = true
-status = 'transitive'
-features = []
-
 [[target-package]]
 name = 'num-integer'
 version = '0.1.43'
@@ -825,12 +820,26 @@ status = 'transitive'
 features = []
 
 [[target-package]]
-name = 'output_vt100'
+name = 'openssl'
+version = '0.10.30'
+crates-io = true
+status = 'transitive'
+features = []
+
+[[target-package]]
+name = 'openssl-probe'
 version = '0.1.2'
 crates-io = true
 status = 'transitive'
 features = []
 
+[[target-package]]
+name = 'openssl-sys'
+version = '0.9.58'
+crates-io = true
+status = 'transitive'
+features = []
+
 [[target-package]]
 name = 'percent-encoding'
 version = '2.1.0'
@@ -865,7 +874,7 @@ version = '0.7.3'
 crates-io = true
 status = 'transitive'
 features = ['alloc', 'default', 'getrandom', 'getrandom_package', 'libc', 'std']
-optional-deps = ['getrandom_package']
+optional-deps = ['getrandom_package', 'libc']
 
 [[target-package]]
 name = 'rand_chacha'
@@ -975,13 +984,6 @@ crates-io = true
 status = 'transitive'
 features = []
 
-[[target-package]]
-name = 'schannel'
-version = '0.1.19'
-crates-io = true
-status = 'transitive'
-features = []
-
 [[target-package]]
 name = 'scopeguard'
 version = '1.1.0'
@@ -1073,6 +1075,13 @@ crates-io = true
 status = 'transitive'
 features = []
 
+[[target-package]]
+name = 'termios'
+version = '0.3.2'
+crates-io = true
+status = 'transitive'
+features = []
+
 [[target-package]]
 name = 'textwrap'
 version = '0.11.0'
@@ -1199,20 +1208,6 @@ crates-io = true
 status = 'transitive'
 features = []
 
-[[target-package]]
-name = 'winapi'
-version = '0.3.9'
-crates-io = true
-status = 'transitive'
-features = ['basetsd', 'consoleapi', 'errhandlingapi', 'fileapi', 'handleapi', 'ioapiset', 'jobapi', 'jobapi2', 'libloaderapi', 'lmcons', 'memoryapi', 'minschannel', 'minwinbase', 'minwindef', 'namedpipeapi', 'ntdef', 'ntstatus', 'processenv', 'processthreadsapi', 'profileapi', 'psapi', 'schannel', 'securitybaseapi', 'shellapi', 'shlobj', 'sspi', 'std', 'synchapi', 'sysinfoapi', 'timezoneapi', 'winbase', 'wincon', 'wincrypt', 'winerror', 'winnt', 'winsock2', 'winuser', 'ws2def', 'ws2ipdef', 'ws2tcpip']
-
-[[target-package]]
-name = 'winapi-util'
-version = '0.1.5'
-crates-io = true
-status = 'transitive'
-features = []
-
 [[host-package]]
 name = 'proptest-derive'
 version = '0.2.0'
@@ -1235,13 +1230,6 @@ status = 'transitive'
 features = ['jobserver', 'parallel']
 optional-deps = ['jobserver']
 
-[[host-package]]
-name = 'ctor'
-version = '0.1.16'
-crates-io = true
-status = 'transitive'
-features = []
-
 [[host-package]]
 name = 'heck'
 version = '0.3.1'
diff --git a/fixtures/guppy/summaries/metadata_guppy_c9b4f76-5.toml b/fixtures/guppy/summaries/metadata_guppy_c9b4f76-5.toml
index 27a8e73c867..fdc2759fb7e 100644
--- a/fixtures/guppy/summaries/metadata_guppy_c9b4f76-5.toml
+++ b/fixtures/guppy/summaries/metadata_guppy_c9b4f76-5.toml
@@ -7,7 +7,7 @@ include-dev = true
 initials-platform = 'standard'
 
 [metadata.host-platform]
-triple = 'x86_64-linux-android'
+triple = 'x86_64-fuchsia'
 target-features = 'all'
 flags = ['bar']
 
diff --git a/fixtures/guppy/summaries/metadata_guppy_c9b4f76-6.toml b/fixtures/guppy/summaries/metadata_guppy_c9b4f76-6.toml
index 04eab35d7b2..c4fc39ba85c 100644
--- a/fixtures/guppy/summaries/metadata_guppy_c9b4f76-6.toml
+++ b/fixtures/guppy/summaries/metadata_guppy_c9b4f76-6.toml
@@ -7,7 +7,7 @@ include-dev = false
 initials-platform = 'standard'
 
 [metadata.host-platform]
-triple = 'i586-unknown-linux-musl'
+triple = 'i586-unknown-linux-gnu'
 target-features = 'all'
 
 [metadata.target-platform]
diff --git a/fixtures/large/hakari/metadata_libra-0.toml b/fixtures/large/hakari/metadata_libra-0.toml
index 98988d76a3e..45ac8fd15e0 100644
--- a/fixtures/large/hakari/metadata_libra-0.toml
+++ b/fixtures/large/hakari/metadata_libra-0.toml
@@ -6,7 +6,7 @@
 # unify-target-host = 'replicate-target-on-host'
 # output-single-feature = true
 # dep-format-version = '2'
-# platforms = ['x86_64-pc-windows-msvc', 'arm-unknown-linux-musleabi', 'armv7-unknown-linux-gnueabi']
+# platforms = ['x86_64-pc-windows-msvc', 'arm-unknown-linux-musleabihf', 'armv7-unknown-freebsd']
 # [[traversal-excludes.ids]]
 # name = 'netcore'
 # version = '0.1.0'
@@ -765,7 +765,7 @@ wincolor = { version = "1", default-features = false }
 winreg = { version = "0.6", default-features = false }
 ws2_32-sys = { version = "0.2", default-features = false }
 
-[target.arm-unknown-linux-musleabi.dependencies]
+[target.arm-unknown-linux-musleabihf.dependencies]
 ansi_term = { version = "0.11", default-features = false }
 c2-chacha = { version = "0.2", default-features = false, features = ["lazy_static", "simd", "std"] }
 lazy_static = { version = "1", default-features = false, features = ["spin", "spin_no_std"] }
@@ -778,7 +778,7 @@ tokio-uds = { version = "0.2", default-features = false }
 utf8parse = { version = "0.1", default-features = false }
 void = { version = "1", features = ["std"] }
 
-[target.arm-unknown-linux-musleabi.build-dependencies]
+[target.arm-unknown-linux-musleabihf.build-dependencies]
 ansi_term = { version = "0.11", default-features = false }
 c2-chacha = { version = "0.2", default-features = false, features = ["lazy_static", "simd", "std"] }
 lazy_static = { version = "1", default-features = false, features = ["spin", "spin_no_std"] }
@@ -791,7 +791,7 @@ tokio-uds = { version = "0.2", default-features = false }
 utf8parse = { version = "0.1", default-features = false }
 void = { version = "1", features = ["std"] }
 
-[target.armv7-unknown-linux-gnueabi.dependencies]
+[target.armv7-unknown-freebsd.dependencies]
 ansi_term = { version = "0.11", default-features = false }
 c2-chacha = { version = "0.2", default-features = false, features = ["lazy_static", "simd", "std"] }
 lazy_static = { version = "1", default-features = false, features = ["spin", "spin_no_std"] }
@@ -804,7 +804,7 @@ tokio-uds = { version = "0.2", default-features = false }
 utf8parse = { version = "0.1", default-features = false }
 void = { version = "1", features = ["std"] }
 
-[target.armv7-unknown-linux-gnueabi.build-dependencies]
+[target.armv7-unknown-freebsd.build-dependencies]
 ansi_term = { version = "0.11", default-features = false }
 c2-chacha = { version = "0.2", default-features = false, features = ["lazy_static", "simd", "std"] }
 lazy_static = { version = "1", default-features = false, features = ["spin", "spin_no_std"] }
diff --git a/fixtures/large/hakari/metadata_libra_9ffd93b-0.toml b/fixtures/large/hakari/metadata_libra_9ffd93b-0.toml
index 12f0d58fd16..ff68ed637b9 100644
--- a/fixtures/large/hakari/metadata_libra_9ffd93b-0.toml
+++ b/fixtures/large/hakari/metadata_libra_9ffd93b-0.toml
@@ -6,7 +6,7 @@
 # unify-target-host = 'auto'
 # output-single-feature = false
 # dep-format-version = '2'
-# platforms = ['aarch64-linux-android', 'x86_64-apple-watchos-sim']
+# platforms = ['aarch64-nintendo-switch-freestanding', 'x86_64-apple-watchos-sim']
 # [[traversal-excludes.ids]]
 # name = 'criterion-plot'
 # version = '0.4.1'
@@ -172,13 +172,11 @@ toml = { version = "0.5" }
 ureq = { version = "0.11", features = ["cookie", "cookies", "json", "rustls", "serde_json", "tls", "webpki", "webpki-roots"] }
 x25519-dalek = { git = "https://github.com/calibra/x25519-dalek.git", branch = "fiat", default-features = false, features = ["fiat_u64_backend", "std", "u64_backend"] }
 
-[target.aarch64-linux-android.dependencies]
+[target.aarch64-nintendo-switch-freestanding.dependencies]
 hyper = { version = "0.13", features = ["net2", "runtime", "stream", "tcp"] }
-libc = { version = "0.2", default-features = false, features = ["extra_traits"] }
 
-[target.aarch64-linux-android.build-dependencies]
+[target.aarch64-nintendo-switch-freestanding.build-dependencies]
 hyper = { version = "0.13", features = ["net2", "runtime", "stream", "tcp"] }
-libc = { version = "0.2", default-features = false, features = ["extra_traits"] }
 
 [target.x86_64-apple-watchos-sim.dependencies]
 hyper = { version = "0.13", features = ["net2", "runtime", "stream", "tcp"] }
diff --git a/fixtures/large/hakari/metadata_libra_f0091a4-0.toml b/fixtures/large/hakari/metadata_libra_f0091a4-0.toml
index 1509d32553e..dcfdcfa7cbf 100644
--- a/fixtures/large/hakari/metadata_libra_f0091a4-0.toml
+++ b/fixtures/large/hakari/metadata_libra_f0091a4-0.toml
@@ -6,7 +6,7 @@
 # unify-target-host = 'none'
 # output-single-feature = false
 # dep-format-version = '2'
-# platforms = ['powerpc-unknown-linux-musl', 'thumbv4t-none-eabi']
+# platforms = ['powerpc-unknown-linux-musl', 'sparcv9-sun-solaris']
 # [[traversal-excludes.ids]]
 # name = 'arrayref'
 # version = '0.3.6'
@@ -133,7 +133,7 @@ toml = { version = "0.5" }
 [target.powerpc-unknown-linux-musl.dependencies]
 hyper = { version = "0.13", features = ["net2", "runtime", "stream", "tcp"] }
 
-[target.thumbv4t-none-eabi.dependencies]
+[target.sparcv9-sun-solaris.dependencies]
 hyper = { version = "0.13", features = ["net2", "runtime", "stream", "tcp"] }
 
 ### END HAKARI SECTION
diff --git a/fixtures/large/hakari/metadata_libra_f0091a4-3.toml b/fixtures/large/hakari/metadata_libra_f0091a4-3.toml
index 0ddc49b2a62..23a9a0ee30a 100644
--- a/fixtures/large/hakari/metadata_libra_f0091a4-3.toml
+++ b/fixtures/large/hakari/metadata_libra_f0091a4-3.toml
@@ -6,7 +6,7 @@
 # unify-target-host = 'none'
 # output-single-feature = false
 # dep-format-version = '2'
-# platforms = ['x86_64-unknown-dragonfly']
+# platforms = ['x86_64-sun-solaris']
 #
 # [traversal-excludes]
 # [[final-excludes.ids]]
@@ -78,7 +78,7 @@ subtle = { version = "2", features = ["i128", "std"] }
 syn-3575ec1268b04181 = { package = "syn", version = "0.15", features = ["clone-impls", "derive", "extra-traits", "full", "parsing", "printing", "proc-macro", "quote", "visit"] }
 syn-dff4ba8e3ae991db = { package = "syn", version = "1", features = ["clone-impls", "derive", "extra-traits", "fold", "full", "parsing", "printing", "proc-macro", "quote", "visit", "visit-mut"] }
 
-[target.x86_64-unknown-dragonfly.dependencies]
+[target.x86_64-sun-solaris.dependencies]
 hyper = { version = "0.13", features = ["net2", "runtime", "stream", "tcp"] }
 
 ### END HAKARI SECTION
diff --git a/fixtures/large/summaries/metadata_libra-1.toml b/fixtures/large/summaries/metadata_libra-1.toml
index 9f64048e41b..02dd44fedfa 100644
--- a/fixtures/large/summaries/metadata_libra-1.toml
+++ b/fixtures/large/summaries/metadata_libra-1.toml
@@ -7,7 +7,7 @@ include-dev = true
 initials-platform = 'proc-macros-on-target'
 
 [metadata.host-platform]
-triple = 'i686-unknown-linux-gnu'
+triple = 'i686-unknown-haiku'
 target-features = 'unknown'
 
 [metadata.target-platform]
diff --git a/fixtures/large/summaries/metadata_libra-2.toml b/fixtures/large/summaries/metadata_libra-2.toml
index 3d7e8a1aa37..8523a15e3cd 100644
--- a/fixtures/large/summaries/metadata_libra-2.toml
+++ b/fixtures/large/summaries/metadata_libra-2.toml
@@ -7,7 +7,7 @@ include-dev = false
 initials-platform = 'host'
 
 [metadata.host-platform]
-triple = 'riscv32gc-unknown-linux-gnu'
+triple = 'powerpc64le-unknown-linux-musl'
 target-features = 'unknown'
 flags = ['foo']
 
diff --git a/fixtures/large/summaries/metadata_libra-4.toml b/fixtures/large/summaries/metadata_libra-4.toml
index 5155f1a904c..cb0016d5777 100644
--- a/fixtures/large/summaries/metadata_libra-4.toml
+++ b/fixtures/large/summaries/metadata_libra-4.toml
@@ -7,7 +7,7 @@ include-dev = false
 initials-platform = 'proc-macros-on-target'
 
 [metadata.host-platform]
-triple = 'armv7-unknown-linux-uclibceabihf'
+triple = 'armv7-unknown-linux-uclibceabi'
 target-features = 'unknown'
 flags = ['bar']
 
diff --git a/fixtures/large/summaries/metadata_libra_9ffd93b-1.toml b/fixtures/large/summaries/metadata_libra_9ffd93b-1.toml
index 6ffc13b2baf..ffd21394ad5 100644
--- a/fixtures/large/summaries/metadata_libra_9ffd93b-1.toml
+++ b/fixtures/large/summaries/metadata_libra_9ffd93b-1.toml
@@ -7,12 +7,12 @@ include-dev = false
 initials-platform = 'proc-macros-on-target'
 
 [metadata.host-platform]
-triple = 'thumbv7m-none-eabi'
+triple = 'thumbv7em-none-eabihf'
 target-features = ['bmi2', 'rdrand', 'sse4.1']
 flags = ['bar', 'test-flag']
 
 [metadata.target-platform]
-triple = 'sparc64-unknown-openbsd'
+triple = 'sparc64-unknown-netbsd'
 target-features = 'unknown'
 flags = ['foo', 'test-flag']
 [[metadata.omitted-packages.ids]]
diff --git a/fixtures/large/summaries/metadata_libra_9ffd93b-2.toml b/fixtures/large/summaries/metadata_libra_9ffd93b-2.toml
index 4f41c22b76d..189257fb710 100644
--- a/fixtures/large/summaries/metadata_libra_9ffd93b-2.toml
+++ b/fixtures/large/summaries/metadata_libra_9ffd93b-2.toml
@@ -7,7 +7,7 @@ include-dev = true
 initials-platform = 'host'
 
 [metadata.host-platform]
-triple = 'armebv7r-none-eabi'
+triple = 'armeb-unknown-linux-gnueabi'
 target-features = 'unknown'
 
 [metadata.target-platform]
@@ -56,6 +56,13 @@ status = 'direct'
 features = ['blocking', 'default', 'dns', 'fnv', 'fs', 'full', 'futures-core', 'io-driver', 'io-std', 'io-util', 'iovec', 'lazy_static', 'libc', 'macros', 'memchr', 'mio', 'mio-named-pipes', 'mio-uds', 'net', 'num_cpus', 'process', 'rt-core', 'rt-threaded', 'rt-util', 'signal', 'signal-hook-registry', 'slab', 'stream', 'sync', 'tcp', 'time', 'tokio-macros', 'udp', 'uds', 'winapi']
 optional-deps = ['fnv', 'futures-core', 'iovec', 'lazy_static', 'libc', 'memchr', 'mio', 'mio-named-pipes', 'mio-uds', 'num_cpus', 'signal-hook-registry', 'slab', 'tokio-macros', 'winapi']
 
+[[host-package]]
+name = 'arc-swap'
+version = '0.4.4'
+crates-io = true
+status = 'transitive'
+features = []
+
 [[host-package]]
 name = 'bytes'
 version = '0.5.4'
@@ -128,6 +135,13 @@ crates-io = true
 status = 'transitive'
 features = ['default', 'with-deprecated']
 
+[[host-package]]
+name = 'mio-uds'
+version = '0.6.7'
+crates-io = true
+status = 'transitive'
+features = []
+
 [[host-package]]
 name = 'net2'
 version = '0.2.33'
@@ -178,6 +192,13 @@ crates-io = true
 status = 'transitive'
 features = ['default']
 
+[[host-package]]
+name = 'signal-hook-registry'
+version = '1.2.0'
+crates-io = true
+status = 'transitive'
+features = []
+
 [[host-package]]
 name = 'slab'
 version = '0.4.2'
diff --git a/fixtures/large/summaries/metadata_libra_9ffd93b-6.toml b/fixtures/large/summaries/metadata_libra_9ffd93b-6.toml
index 81f0f77e0d7..8bff36ff47c 100644
--- a/fixtures/large/summaries/metadata_libra_9ffd93b-6.toml
+++ b/fixtures/large/summaries/metadata_libra_9ffd93b-6.toml
@@ -10,7 +10,7 @@ initials-platform = 'standard'
 spec = 'always'
 
 [metadata.target-platform]
-triple = 'arm-unknown-linux-gnueabihf'
+triple = 'arm-unknown-linux-musleabi'
 target-features = 'all'
 [[metadata.omitted-packages.ids]]
 name = 'Inflector'
diff --git a/fixtures/large/summaries/metadata_libra_f0091a4-0.toml b/fixtures/large/summaries/metadata_libra_f0091a4-0.toml
index f71db98cd82..3203c2b6cc2 100644
--- a/fixtures/large/summaries/metadata_libra_f0091a4-0.toml
+++ b/fixtures/large/summaries/metadata_libra_f0091a4-0.toml
@@ -7,7 +7,7 @@ include-dev = true
 initials-platform = 'host'
 
 [metadata.host-platform]
-triple = 'x86_64-pc-windows-gnullvm'
+triple = 'x86_64-pc-windows-gnu'
 target-features = 'unknown'
 
 [metadata.target-platform]
@@ -2856,6 +2856,13 @@ crates-io = true
 status = 'transitive'
 features = []
 
+[[host-package]]
+name = 'winapi-x86_64-pc-windows-gnu'
+version = '0.4.0'
+crates-io = true
+status = 'transitive'
+features = []
+
 [[host-package]]
 name = 'winreg'
 version = '0.6.2'
diff --git a/fixtures/large/summaries/metadata_libra_f0091a4-3.toml b/fixtures/large/summaries/metadata_libra_f0091a4-3.toml
index 9c17c63d3b6..62c775063f0 100644
--- a/fixtures/large/summaries/metadata_libra_f0091a4-3.toml
+++ b/fixtures/large/summaries/metadata_libra_f0091a4-3.toml
@@ -7,7 +7,7 @@ include-dev = false
 initials-platform = 'standard'
 
 [metadata.host-platform]
-triple = 'i686-pc-windows-gnu'
+triple = 'i686-linux-android'
 target-features = 'unknown'
 
 [metadata.target-platform]
@@ -2460,17 +2460,3 @@ version = '3.1.0'
 crates-io = true
 status = 'transitive'
 features = []
-
-[[host-package]]
-name = 'winapi'
-version = '0.3.8'
-crates-io = true
-status = 'transitive'
-features = ['consoleapi', 'errhandlingapi', 'fileapi', 'handleapi', 'ioapiset', 'knownfolders', 'memoryapi', 'minwinbase', 'minwindef', 'namedpipeapi', 'ntdef', 'ntsecapi', 'ntstatus', 'objbase', 'processenv', 'processthreadsapi', 'profileapi', 'shlobj', 'std', 'synchapi', 'sysinfoapi', 'threadpoollegacyapiset', 'timezoneapi', 'winbase', 'wincon', 'winerror', 'winnt', 'winsock2', 'ws2def', 'ws2ipdef', 'ws2tcpip']
-
-[[host-package]]
-name = 'winapi-i686-pc-windows-gnu'
-version = '0.4.0'
-crates-io = true
-status = 'transitive'
-features = []
diff --git a/fixtures/large/summaries/metadata_libra_f0091a4-4.toml b/fixtures/large/summaries/metadata_libra_f0091a4-4.toml
index cb914b256b2..5072ea865d3 100644
--- a/fixtures/large/summaries/metadata_libra_f0091a4-4.toml
+++ b/fixtures/large/summaries/metadata_libra_f0091a4-4.toml
@@ -7,7 +7,7 @@ include-dev = true
 initials-platform = 'proc-macros-on-target'
 
 [metadata.host-platform]
-triple = 'x86_64-unknown-linux-gnux32'
+triple = 'x86_64-unknown-linux-gnu'
 target-features = 'unknown'
 flags = ['abc', 'foo']
 
diff --git a/fixtures/large/summaries/metadata_libra_f0091a4-6.toml b/fixtures/large/summaries/metadata_libra_f0091a4-6.toml
index 5752ed060a4..33b3c217705 100644
--- a/fixtures/large/summaries/metadata_libra_f0091a4-6.toml
+++ b/fixtures/large/summaries/metadata_libra_f0091a4-6.toml
@@ -7,7 +7,7 @@ include-dev = true
 initials-platform = 'host'
 
 [metadata.host-platform]
-triple = 'armv7-apple-ios'
+triple = 'armv6k-nintendo-3ds'
 target-features = 'unknown'
 flags = ['cargo_web']
 
@@ -2308,13 +2308,6 @@ source = 'git+https://github.com/busyjay/lz4-rs.git?branch=adjust-build#5a8afe40
 status = 'transitive'
 features = []
 
-[[host-package]]
-name = 'mach_o_sys'
-version = '0.1.1'
-crates-io = true
-status = 'transitive'
-features = []
-
 [[host-package]]
 name = 'matches'
 version = '0.1.8'
diff --git a/fixtures/large/summaries/metadata_libra_f0091a4-7.toml b/fixtures/large/summaries/metadata_libra_f0091a4-7.toml
index 1493aacdb03..1eae92585b1 100644
--- a/fixtures/large/summaries/metadata_libra_f0091a4-7.toml
+++ b/fixtures/large/summaries/metadata_libra_f0091a4-7.toml
@@ -7,11 +7,11 @@ include-dev = false
 initials-platform = 'standard'
 
 [metadata.host-platform]
-triple = 'riscv64imac-unknown-none-elf'
+triple = 'riscv64gc-unknown-none-elf'
 target-features = 'all'
 
 [metadata.target-platform]
-triple = 'armv7-unknown-linux-gnueabi'
+triple = 'armv7-unknown-freebsd'
 target-features = 'unknown'
 [[metadata.omitted-packages.ids]]
 name = 'hyper'
diff --git a/fixtures/small/hakari/metadata1-0.toml b/fixtures/small/hakari/metadata1-0.toml
index f34a7c5ff74..ec7cd40d3cb 100644
--- a/fixtures/small/hakari/metadata1-0.toml
+++ b/fixtures/small/hakari/metadata1-0.toml
@@ -6,7 +6,7 @@
 # unify-target-host = 'auto'
 # output-single-feature = false
 # dep-format-version = '2'
-# platforms = ['riscv64gc-unknown-none-elf', 'armv7r-none-eabi']
+# platforms = ['riscv64gc-unknown-none-elf', 'armv7k-apple-watchos']
 # [[traversal-excludes.ids]]
 # name = 'linked-hash-map'
 # version = '0.5.2'
diff --git a/fixtures/small/hakari/metadata1-2.toml b/fixtures/small/hakari/metadata1-2.toml
index 7fac568e9a0..00c06778f14 100644
--- a/fixtures/small/hakari/metadata1-2.toml
+++ b/fixtures/small/hakari/metadata1-2.toml
@@ -6,7 +6,7 @@
 # unify-target-host = 'auto'
 # output-single-feature = false
 # dep-format-version = '2'
-# platforms = ['aarch64-unknown-uefi']
+# platforms = ['aarch64-uwp-windows-msvc']
 # [[traversal-excludes.ids]]
 # name = 'regex'
 # version = '1.3.1'
diff --git a/fixtures/small/hakari/metadata1-3.toml b/fixtures/small/hakari/metadata1-3.toml
index ddf0837ccb9..1e4ec098753 100644
--- a/fixtures/small/hakari/metadata1-3.toml
+++ b/fixtures/small/hakari/metadata1-3.toml
@@ -6,7 +6,7 @@
 # unify-target-host = 'auto'
 # output-single-feature = true
 # dep-format-version = '2'
-# platforms = ['x86_64-sun-solaris', 'i686-pc-windows-gnu', 'armv7a-kmc-solid_asp3-eabihf']
+# platforms = ['x86_64-pc-windows-msvc', 'i686-pc-windows-gnu', 'armv7a-kmc-solid_asp3-eabi']
 # [[traversal-excludes.ids]]
 # name = 'bitflags'
 # version = '1.1.0'
diff --git a/fixtures/small/hakari/metadata2-1.toml b/fixtures/small/hakari/metadata2-1.toml
index 177ebcaac9a..4e659f5e5ea 100644
--- a/fixtures/small/hakari/metadata2-1.toml
+++ b/fixtures/small/hakari/metadata2-1.toml
@@ -6,7 +6,7 @@
 # unify-target-host = 'unify-if-both'
 # output-single-feature = false
 # dep-format-version = '2'
-# platforms = ['aarch64-apple-tvos', 'armv7-unknown-linux-uclibceabihf']
+# platforms = ['aarch64-apple-tvos', 'armv7-unknown-linux-uclibceabi']
 # [[traversal-excludes.ids]]
 # name = 'quote'
 # version = '1.0.2'
diff --git a/fixtures/small/hakari/metadata2-2.toml b/fixtures/small/hakari/metadata2-2.toml
index ad43cf7073b..ccd9b31e0cd 100644
--- a/fixtures/small/hakari/metadata2-2.toml
+++ b/fixtures/small/hakari/metadata2-2.toml
@@ -6,7 +6,7 @@
 # unify-target-host = 'replicate-target-on-host'
 # output-single-feature = true
 # dep-format-version = '2'
-# platforms = ['i686-linux-android', 'riscv64gc-unknown-linux-musl']
+# platforms = ['i686-apple-darwin', 'riscv64gc-unknown-linux-musl']
 #
 # [traversal-excludes]
 # [[final-excludes.ids]]
diff --git a/fixtures/small/hakari/metadata_alternate_registries-0.toml b/fixtures/small/hakari/metadata_alternate_registries-0.toml
index 092891b3819..2aff9d2fe41 100644
--- a/fixtures/small/hakari/metadata_alternate_registries-0.toml
+++ b/fixtures/small/hakari/metadata_alternate_registries-0.toml
@@ -6,7 +6,7 @@
 # unify-target-host = 'none'
 # output-single-feature = false
 # dep-format-version = '2'
-# platforms = ['armv7r-none-eabihf', 'riscv32gc-unknown-linux-gnu', 'powerpc64-unknown-linux-musl']
+# platforms = ['armv7r-none-eabi', 'powerpc64le-unknown-linux-musl', 'powerpc64-unknown-linux-musl']
 #
 # [traversal-excludes]
 # [[final-excludes.ids]]
diff --git a/fixtures/small/hakari/metadata_alternate_registries-1.toml b/fixtures/small/hakari/metadata_alternate_registries-1.toml
index 5db51e95e77..7b9a549f485 100644
--- a/fixtures/small/hakari/metadata_alternate_registries-1.toml
+++ b/fixtures/small/hakari/metadata_alternate_registries-1.toml
@@ -6,7 +6,7 @@
 # unify-target-host = 'unify-if-both'
 # output-single-feature = true
 # dep-format-version = '2'
-# platforms = ['i686-unknown-uefi', 'arm-unknown-linux-musleabihf']
+# platforms = ['i686-unknown-openbsd', 'arm64_32-apple-watchos']
 #
 # [traversal-excludes]
 # [[final-excludes.ids]]
diff --git a/fixtures/small/hakari/metadata_build_targets1-3.toml b/fixtures/small/hakari/metadata_build_targets1-3.toml
index b33636d2d99..0d51d655d5a 100644
--- a/fixtures/small/hakari/metadata_build_targets1-3.toml
+++ b/fixtures/small/hakari/metadata_build_targets1-3.toml
@@ -6,7 +6,7 @@
 # unify-target-host = 'replicate-target-on-host'
 # output-single-feature = false
 # dep-format-version = '2'
-# platforms = ['thumbv7neon-linux-androideabi']
+# platforms = ['thumbv7m-none-eabi']
 # [[traversal-excludes.ids]]
 # name = 'testcrate'
 # version = '0.1.0'
diff --git a/fixtures/small/hakari/metadata_builddep-0.toml b/fixtures/small/hakari/metadata_builddep-0.toml
index 2134d10f1e6..cd618f89680 100644
--- a/fixtures/small/hakari/metadata_builddep-0.toml
+++ b/fixtures/small/hakari/metadata_builddep-0.toml
@@ -6,7 +6,7 @@
 # unify-target-host = 'auto'
 # output-single-feature = true
 # dep-format-version = '2'
-# platforms = ['powerpc-unknown-netbsd', 'mipsisa64r6el-unknown-linux-gnuabi64', 'i686-unknown-netbsd']
+# platforms = ['powerpc-unknown-openbsd', 'mipsisa64r6el-unknown-linux-gnuabi64', 'i686-unknown-netbsd']
 # [[traversal-excludes.ids]]
 # name = 'builddep'
 # version = '0.1.0'
diff --git a/fixtures/small/hakari/metadata_builddep-1.toml b/fixtures/small/hakari/metadata_builddep-1.toml
index 5086f975af8..241b3862119 100644
--- a/fixtures/small/hakari/metadata_builddep-1.toml
+++ b/fixtures/small/hakari/metadata_builddep-1.toml
@@ -6,7 +6,7 @@
 # unify-target-host = 'replicate-target-on-host'
 # output-single-feature = false
 # dep-format-version = '2'
-# platforms = ['wasm32-wasi', 'armv5te-unknown-linux-gnueabi', 'riscv64imac-unknown-none-elf']
+# platforms = ['wasm32-wasi', 'armv4t-unknown-linux-gnueabi', 'riscv64gc-unknown-openbsd']
 # [[traversal-excludes.ids]]
 # name = 'builddep'
 # version = '0.1.0'
diff --git a/fixtures/small/hakari/metadata_builddep-3.toml b/fixtures/small/hakari/metadata_builddep-3.toml
index a87054e5635..0879b127fc2 100644
--- a/fixtures/small/hakari/metadata_builddep-3.toml
+++ b/fixtures/small/hakari/metadata_builddep-3.toml
@@ -6,7 +6,7 @@
 # unify-target-host = 'auto'
 # output-single-feature = false
 # dep-format-version = '2'
-# platforms = ['i686-unknown-haiku', 'riscv64imac-unknown-none-elf']
+# platforms = ['i686-unknown-haiku', 'riscv64gc-unknown-none-elf']
 # [[traversal-excludes.ids]]
 # name = 'builddep'
 # version = '0.1.0'
diff --git a/fixtures/small/hakari/metadata_cycle1-1.toml b/fixtures/small/hakari/metadata_cycle1-1.toml
index a398996388b..3cbb39c0425 100644
--- a/fixtures/small/hakari/metadata_cycle1-1.toml
+++ b/fixtures/small/hakari/metadata_cycle1-1.toml
@@ -6,7 +6,7 @@
 # unify-target-host = 'auto'
 # output-single-feature = false
 # dep-format-version = '2'
-# platforms = ['s390x-unknown-linux-gnu', 'x86_64-apple-ios-macabi', 'mips64el-unknown-linux-gnuabi64']
+# platforms = ['riscv64imac-unknown-none-elf', 'x86_64-apple-ios', 'mips64el-unknown-linux-gnuabi64']
 # [[traversal-excludes.ids]]
 # name = 'testcycles-base'
 # version = '0.1.0'
diff --git a/fixtures/small/hakari/metadata_cycle2-1.toml b/fixtures/small/hakari/metadata_cycle2-1.toml
index 3b222640303..e5cc63c206f 100644
--- a/fixtures/small/hakari/metadata_cycle2-1.toml
+++ b/fixtures/small/hakari/metadata_cycle2-1.toml
@@ -6,7 +6,7 @@
 # unify-target-host = 'none'
 # output-single-feature = true
 # dep-format-version = '2'
-# platforms = ['armv7-unknown-linux-gnueabi']
+# platforms = ['armv7-unknown-freebsd']
 # [[traversal-excludes.ids]]
 # name = 'lower-a'
 # version = '0.1.0'
diff --git a/fixtures/small/hakari/metadata_cycle_features-0.toml b/fixtures/small/hakari/metadata_cycle_features-0.toml
index 833e06dcfe2..ed0e2cf03b6 100644
--- a/fixtures/small/hakari/metadata_cycle_features-0.toml
+++ b/fixtures/small/hakari/metadata_cycle_features-0.toml
@@ -6,7 +6,7 @@
 # unify-target-host = 'replicate-target-on-host'
 # output-single-feature = true
 # dep-format-version = '2'
-# platforms = ['armv7-linux-androideabi', 'riscv32gc-unknown-linux-musl', 'x86_64-apple-ios-macabi']
+# platforms = ['armv7-apple-ios', 'riscv32gc-unknown-linux-gnu', 'x86_64-apple-ios']
 # [[traversal-excludes.ids]]
 # name = 'testcycles-helper'
 # version = '0.1.0'
diff --git a/fixtures/small/hakari/metadata_cycle_features-3.toml b/fixtures/small/hakari/metadata_cycle_features-3.toml
index 47ec516b0bc..bc1d9e00941 100644
--- a/fixtures/small/hakari/metadata_cycle_features-3.toml
+++ b/fixtures/small/hakari/metadata_cycle_features-3.toml
@@ -6,7 +6,7 @@
 # unify-target-host = 'unify-if-both'
 # output-single-feature = true
 # dep-format-version = '2'
-# platforms = ['x86_64-unknown-linux-musl', 'armv6-unknown-freebsd']
+# platforms = ['x86_64-unknown-linux-musl', 'armv5te-unknown-linux-uclibceabi']
 # [[traversal-excludes.ids]]
 # name = 'testcycles-base'
 # version = '0.1.0'
diff --git a/fixtures/small/hakari/metadata_dups-1.toml b/fixtures/small/hakari/metadata_dups-1.toml
index c7bb3dd3b6d..a3c18b790dc 100644
--- a/fixtures/small/hakari/metadata_dups-1.toml
+++ b/fixtures/small/hakari/metadata_dups-1.toml
@@ -6,7 +6,7 @@
 # unify-target-host = 'none'
 # output-single-feature = false
 # dep-format-version = '2'
-# platforms = ['i386-apple-ios', 'riscv32imac-unknown-xous-elf', 'armv5te-unknown-linux-gnueabi']
+# platforms = ['i386-apple-ios', 'riscv32imac-unknown-xous-elf', 'armv4t-unknown-linux-gnueabi']
 # [[traversal-excludes.ids]]
 # name = 'lazy_static'
 # version = '0.2.11'
diff --git a/fixtures/small/hakari/metadata_dups-3.toml b/fixtures/small/hakari/metadata_dups-3.toml
index c88dd64809e..457f5094a1d 100644
--- a/fixtures/small/hakari/metadata_dups-3.toml
+++ b/fixtures/small/hakari/metadata_dups-3.toml
@@ -6,7 +6,7 @@
 # unify-target-host = 'none'
 # output-single-feature = true
 # dep-format-version = '2'
-# platforms = ['armv5te-unknown-linux-gnueabi']
+# platforms = ['armv4t-none-eabi']
 # [[traversal-excludes.ids]]
 # name = 'bytes'
 # version = '0.3.0'
diff --git a/fixtures/small/hakari/metadata_proc_macro1-0.toml b/fixtures/small/hakari/metadata_proc_macro1-0.toml
index 3e47ac6b2b1..cbddb86d02c 100644
--- a/fixtures/small/hakari/metadata_proc_macro1-0.toml
+++ b/fixtures/small/hakari/metadata_proc_macro1-0.toml
@@ -6,7 +6,7 @@
 # unify-target-host = 'replicate-target-on-host'
 # output-single-feature = false
 # dep-format-version = '2'
-# platforms = ['aarch64-uwp-windows-msvc', 'x86_64-wrs-vxworks', 'powerpc-wrs-vxworks']
+# platforms = ['aarch64-wrs-vxworks', 'x86_64-wrs-vxworks', 'powerpc-wrs-vxworks-spe']
 #
 # [traversal-excludes]
 # [[final-excludes.ids]]
diff --git a/fixtures/small/hakari/metadata_proc_macro1-1.toml b/fixtures/small/hakari/metadata_proc_macro1-1.toml
index bc45b200ce8..6d90fa8dfb8 100644
--- a/fixtures/small/hakari/metadata_proc_macro1-1.toml
+++ b/fixtures/small/hakari/metadata_proc_macro1-1.toml
@@ -6,7 +6,7 @@
 # unify-target-host = 'replicate-target-on-host'
 # output-single-feature = false
 # dep-format-version = '2'
-# platforms = ['x86_64-apple-watchos-sim', 'armv7a-none-eabihf', 'armv7-unknown-netbsd-eabihf']
+# platforms = ['x86_64-apple-tvos', 'armv7a-none-eabihf', 'armv7-unknown-netbsd-eabihf']
 # [[traversal-excludes.ids]]
 # name = 'dev-user'
 # version = '0.1.0'
diff --git a/fixtures/small/hakari/metadata_proc_macro1-3.toml b/fixtures/small/hakari/metadata_proc_macro1-3.toml
index a5dd731e05c..4e5c85fb913 100644
--- a/fixtures/small/hakari/metadata_proc_macro1-3.toml
+++ b/fixtures/small/hakari/metadata_proc_macro1-3.toml
@@ -6,7 +6,7 @@
 # unify-target-host = 'unify-if-both'
 # output-single-feature = true
 # dep-format-version = '2'
-# platforms = ['arm-unknown-linux-musleabihf', 'armv7-wrs-vxworks-eabihf', 'aarch64-unknown-redox']
+# platforms = ['arm-unknown-linux-musleabihf', 'armv7-unknown-netbsd-eabihf', 'aarch64-unknown-redox']
 # [[traversal-excludes.ids]]
 # name = 'build-user'
 # version = '0.1.0'
diff --git a/fixtures/small/hakari/metadata_targets1-0.toml b/fixtures/small/hakari/metadata_targets1-0.toml
index 8d3b01ca9f3..41081643990 100644
--- a/fixtures/small/hakari/metadata_targets1-0.toml
+++ b/fixtures/small/hakari/metadata_targets1-0.toml
@@ -6,7 +6,7 @@
 # unify-target-host = 'none'
 # output-single-feature = true
 # dep-format-version = '2'
-# platforms = ['aarch64-apple-ios-macabi', 'armv7-unknown-linux-gnueabi']
+# platforms = ['aarch64-apple-ios-macabi', 'armv7-unknown-freebsd']
 # [[traversal-excludes.ids]]
 # name = 'dep-a'
 # version = '0.1.0'
diff --git a/fixtures/small/hakari/metadata_targets1-1.toml b/fixtures/small/hakari/metadata_targets1-1.toml
index f69b12cbe2d..7041495f9e7 100644
--- a/fixtures/small/hakari/metadata_targets1-1.toml
+++ b/fixtures/small/hakari/metadata_targets1-1.toml
@@ -6,7 +6,7 @@
 # unify-target-host = 'auto'
 # output-single-feature = true
 # dep-format-version = '2'
-# platforms = ['armv7a-kmc-solid_asp3-eabihf', 'mips64el-unknown-linux-muslabi64', 'i686-pc-windows-gnu']
+# platforms = ['armv7a-kmc-solid_asp3-eabi', 'mips64el-unknown-linux-muslabi64', 'i686-pc-windows-gnu']
 # [[traversal-excludes.ids]]
 # name = 'serde'
 # version = '1.0.105'
@@ -19,7 +19,7 @@ bytes = { version = "0.5", features = ["serde", "std"] }
 dep-a = { path = "/Users/fakeuser/local/testcrates/testcrate-targets/../dep-a", default-features = false, features = ["bar", "baz", "foo", "quux"] }
 lazy_static-dff4ba8e3ae991db = { package = "lazy_static", version = "1", default-features = false }
 
-[target.armv7a-kmc-solid_asp3-eabihf.dependencies]
+[target.armv7a-kmc-solid_asp3-eabi.dependencies]
 lazy_static-6f8ce4dd05d13bba = { package = "lazy_static", version = "0.2", default-features = false }
 
 [target.mips64el-unknown-linux-muslabi64.dependencies]
diff --git a/fixtures/small/hakari/metadata_targets1-2.toml b/fixtures/small/hakari/metadata_targets1-2.toml
index ae0180c5b79..b74ec315a72 100644
--- a/fixtures/small/hakari/metadata_targets1-2.toml
+++ b/fixtures/small/hakari/metadata_targets1-2.toml
@@ -6,7 +6,7 @@
 # unify-target-host = 'unify-if-both'
 # output-single-feature = true
 # dep-format-version = '2'
-# platforms = ['i686-pc-windows-msvc', 'armv4t-unknown-linux-gnueabi', 'powerpc-wrs-vxworks-spe']
+# platforms = ['i686-pc-windows-msvc', 'armebv7r-none-eabihf', 'powerpc-wrs-vxworks-spe']
 # [[traversal-excludes.ids]]
 # name = 'dep-a'
 # version = '0.1.0'
diff --git a/fixtures/small/hakari/metadata_weak_namespaced_features-2.toml b/fixtures/small/hakari/metadata_weak_namespaced_features-2.toml
index 3f2b0345ad2..fa0d2d25010 100644
--- a/fixtures/small/hakari/metadata_weak_namespaced_features-2.toml
+++ b/fixtures/small/hakari/metadata_weak_namespaced_features-2.toml
@@ -6,7 +6,7 @@
 # unify-target-host = 'unify-if-both'
 # output-single-feature = false
 # dep-format-version = '2'
-# platforms = ['x86_64-apple-ios', 'mips64el-unknown-linux-gnuabi64']
+# platforms = ['x86_64-apple-darwin', 'mips64el-unknown-linux-gnuabi64']
 # [[traversal-excludes.ids]]
 # name = 'arrayvec'
 # version = '0.7.2'
diff --git a/fixtures/small/hakari/metadata_weak_namespaced_features-3.toml b/fixtures/small/hakari/metadata_weak_namespaced_features-3.toml
index 8c65dcc96a1..15d29906ceb 100644
--- a/fixtures/small/hakari/metadata_weak_namespaced_features-3.toml
+++ b/fixtures/small/hakari/metadata_weak_namespaced_features-3.toml
@@ -6,7 +6,7 @@
 # unify-target-host = 'replicate-target-on-host'
 # output-single-feature = true
 # dep-format-version = '2'
-# platforms = ['sparc64-unknown-openbsd', 'riscv32imc-esp-espidf', 'powerpc64le-unknown-linux-gnu']
+# platforms = ['sparc64-unknown-netbsd', 'riscv32imac-unknown-xous-elf', 'powerpc64le-unknown-linux-gnu']
 # [[traversal-excludes.ids]]
 # name = 'arrayvec'
 # version = '0.7.2'
diff --git a/fixtures/small/summaries/metadata1-0.toml b/fixtures/small/summaries/metadata1-0.toml
index b44512453d8..a536c7396fe 100644
--- a/fixtures/small/summaries/metadata1-0.toml
+++ b/fixtures/small/summaries/metadata1-0.toml
@@ -10,7 +10,7 @@ initials-platform = 'proc-macros-on-target'
 spec = 'always'
 
 [metadata.target-platform]
-triple = 'armebv7r-none-eabi'
+triple = 'armeb-unknown-linux-gnueabi'
 target-features = 'unknown'
 flags = ['cargo_web']
 [[metadata.omitted-packages.ids]]
diff --git a/fixtures/small/summaries/metadata1-2.toml b/fixtures/small/summaries/metadata1-2.toml
index 3094cf791e3..93600aa4bba 100644
--- a/fixtures/small/summaries/metadata1-2.toml
+++ b/fixtures/small/summaries/metadata1-2.toml
@@ -7,7 +7,7 @@ include-dev = true
 initials-platform = 'host'
 
 [metadata.host-platform]
-triple = 'riscv64imac-unknown-none-elf'
+triple = 'riscv64gc-unknown-openbsd'
 target-features = 'all'
 
 [metadata.target-platform]
diff --git a/fixtures/small/summaries/metadata1-3.toml b/fixtures/small/summaries/metadata1-3.toml
index d16729f6402..48c0a9ed405 100644
--- a/fixtures/small/summaries/metadata1-3.toml
+++ b/fixtures/small/summaries/metadata1-3.toml
@@ -10,7 +10,7 @@ initials-platform = 'proc-macros-on-target'
 spec = 'any'
 
 [metadata.target-platform]
-triple = 'sparcv9-sun-solaris'
+triple = 'sparc64-unknown-openbsd'
 target-features = 'all'
 [[metadata.omitted-packages.ids]]
 name = 'serde'
diff --git a/fixtures/small/summaries/metadata1-4.toml b/fixtures/small/summaries/metadata1-4.toml
index 1b9acb4f8a0..7f84d86ad01 100644
--- a/fixtures/small/summaries/metadata1-4.toml
+++ b/fixtures/small/summaries/metadata1-4.toml
@@ -10,7 +10,7 @@ initials-platform = 'host'
 spec = 'always'
 
 [metadata.target-platform]
-triple = 'thumbv8m.main-none-eabihf'
+triple = 'thumbv8m.main-none-eabi'
 target-features = ['sse', 'sse3', 'xsaves']
 [[metadata.omitted-packages.ids]]
 name = 'testcrate'
diff --git a/fixtures/small/summaries/metadata1-5.toml b/fixtures/small/summaries/metadata1-5.toml
index 9b65e84cf13..1236e45aa1f 100644
--- a/fixtures/small/summaries/metadata1-5.toml
+++ b/fixtures/small/summaries/metadata1-5.toml
@@ -10,7 +10,7 @@ initials-platform = 'host'
 spec = 'any'
 
 [metadata.target-platform]
-triple = 'i686-unknown-netbsd'
+triple = 'i686-unknown-linux-musl'
 target-features = 'all'
 flags = ['bar']
 [[metadata.omitted-packages.ids]]
diff --git a/fixtures/small/summaries/metadata1-6.toml b/fixtures/small/summaries/metadata1-6.toml
index 67d6a5cf4e1..1ec9ac8a4ce 100644
--- a/fixtures/small/summaries/metadata1-6.toml
+++ b/fixtures/small/summaries/metadata1-6.toml
@@ -7,7 +7,7 @@ include-dev = true
 initials-platform = 'standard'
 
 [metadata.host-platform]
-triple = 'i686-apple-darwin'
+triple = 'i586-unknown-linux-musl'
 target-features = 'all'
 flags = ['abc']
 
diff --git a/fixtures/small/summaries/metadata1-7.toml b/fixtures/small/summaries/metadata1-7.toml
index 4010f534ae9..7e9baecf904 100644
--- a/fixtures/small/summaries/metadata1-7.toml
+++ b/fixtures/small/summaries/metadata1-7.toml
@@ -12,7 +12,7 @@ target-features = 'unknown'
 flags = ['flag-test', 'foo']
 
 [metadata.target-platform]
-triple = 'sparc64-unknown-netbsd'
+triple = 'sparc64-unknown-linux-gnu'
 target-features = 'all'
 flags = ['foo']
 [[metadata.omitted-packages.ids]]
diff --git a/fixtures/small/summaries/metadata_alternate_registries-1.toml b/fixtures/small/summaries/metadata_alternate_registries-1.toml
index db4d99ebf41..622fd960276 100644
--- a/fixtures/small/summaries/metadata_alternate_registries-1.toml
+++ b/fixtures/small/summaries/metadata_alternate_registries-1.toml
@@ -11,7 +11,7 @@ triple = 'armv7a-kmc-solid_asp3-eabi'
 target-features = ['aes', 'fma', 'sha', 'sse2', 'xsavec']
 
 [metadata.target-platform]
-triple = 'mips64-unknown-linux-gnuabi64'
+triple = 'mips64-openwrt-linux-musl'
 target-features = 'all'
 [[metadata.omitted-packages.ids]]
 name = 'quote'
diff --git a/fixtures/small/summaries/metadata_alternate_registries-4.toml b/fixtures/small/summaries/metadata_alternate_registries-4.toml
index e763393e4cb..1aefaa2b548 100644
--- a/fixtures/small/summaries/metadata_alternate_registries-4.toml
+++ b/fixtures/small/summaries/metadata_alternate_registries-4.toml
@@ -7,7 +7,7 @@ include-dev = true
 initials-platform = 'proc-macros-on-target'
 
 [metadata.host-platform]
-triple = 'x86_64-fortanix-unknown-sgx'
+triple = 'x86_64-apple-watchos-sim'
 target-features = 'all'
 flags = ['abc']
 
diff --git a/fixtures/small/summaries/metadata_alternate_registries-6.toml b/fixtures/small/summaries/metadata_alternate_registries-6.toml
index b0842c56142..a02db96669d 100644
--- a/fixtures/small/summaries/metadata_alternate_registries-6.toml
+++ b/fixtures/small/summaries/metadata_alternate_registries-6.toml
@@ -10,7 +10,7 @@ initials-platform = 'host'
 spec = 'always'
 
 [metadata.target-platform]
-triple = 'hexagon-unknown-linux-musl'
+triple = 'bpfel-unknown-none'
 target-features = 'unknown'
 [[metadata.omitted-packages.ids]]
 name = 'proc-macro2'
diff --git a/fixtures/small/summaries/metadata_build_targets1-1.toml b/fixtures/small/summaries/metadata_build_targets1-1.toml
index 5ffc02f3b8e..a19a7dc699e 100644
--- a/fixtures/small/summaries/metadata_build_targets1-1.toml
+++ b/fixtures/small/summaries/metadata_build_targets1-1.toml
@@ -10,7 +10,7 @@ initials-platform = 'proc-macros-on-target'
 spec = 'always'
 
 [metadata.target-platform]
-triple = 'armv7s-apple-ios'
+triple = 'armv7r-none-eabihf'
 target-features = 'all'
 [[metadata.omitted-packages.ids]]
 name = 'testcrate'
diff --git a/fixtures/small/summaries/metadata_build_targets1-5.toml b/fixtures/small/summaries/metadata_build_targets1-5.toml
index f51cae2b4bc..227c7a0eda5 100644
--- a/fixtures/small/summaries/metadata_build_targets1-5.toml
+++ b/fixtures/small/summaries/metadata_build_targets1-5.toml
@@ -7,7 +7,7 @@ include-dev = false
 initials-platform = 'standard'
 
 [metadata.host-platform]
-triple = 'powerpc-wrs-vxworks-spe'
+triple = 'powerpc64-unknown-freebsd'
 target-features = 'all'
 flags = ['abc']
 
diff --git a/fixtures/small/summaries/metadata_build_targets1-7.toml b/fixtures/small/summaries/metadata_build_targets1-7.toml
index 6b1bf1e5c4d..0e6d1c51dcb 100644
--- a/fixtures/small/summaries/metadata_build_targets1-7.toml
+++ b/fixtures/small/summaries/metadata_build_targets1-7.toml
@@ -7,7 +7,7 @@ include-dev = true
 initials-platform = 'proc-macros-on-target'
 
 [metadata.host-platform]
-triple = 'sparc64-unknown-netbsd'
+triple = 'sparc64-unknown-linux-gnu'
 target-features = 'all'
 flags = ['cargo_web']
 
diff --git a/fixtures/small/summaries/metadata_builddep-0.toml b/fixtures/small/summaries/metadata_builddep-0.toml
index a8e57d56c28..9752798b352 100644
--- a/fixtures/small/summaries/metadata_builddep-0.toml
+++ b/fixtures/small/summaries/metadata_builddep-0.toml
@@ -7,12 +7,12 @@ include-dev = true
 initials-platform = 'standard'
 
 [metadata.host-platform]
-triple = 'i686-wrs-vxworks'
+triple = 'i686-uwp-windows-msvc'
 target-features = 'all'
 flags = ['test-flag']
 
 [metadata.target-platform]
-triple = 'thumbv7neon-unknown-linux-musleabihf'
+triple = 'thumbv7neon-unknown-linux-gnueabihf'
 target-features = 'unknown'
 flags = ['test-flag']
 [[metadata.omitted-packages.ids]]
diff --git a/fixtures/small/summaries/metadata_builddep-2.toml b/fixtures/small/summaries/metadata_builddep-2.toml
index 266bd1384a2..750580c2836 100644
--- a/fixtures/small/summaries/metadata_builddep-2.toml
+++ b/fixtures/small/summaries/metadata_builddep-2.toml
@@ -12,7 +12,7 @@ target-features = 'unknown'
 flags = ['cargo_web', 'test-flag']
 
 [metadata.target-platform]
-triple = 'thumbv7neon-unknown-linux-musleabihf'
+triple = 'thumbv7neon-unknown-linux-gnueabihf'
 target-features = 'all'
 flags = ['abc', 'flag-test']
 [[metadata.omitted-packages.ids]]
diff --git a/fixtures/small/summaries/metadata_builddep-3.toml b/fixtures/small/summaries/metadata_builddep-3.toml
index 8067a407cd9..99c2c1fe87a 100644
--- a/fixtures/small/summaries/metadata_builddep-3.toml
+++ b/fixtures/small/summaries/metadata_builddep-3.toml
@@ -10,7 +10,7 @@ initials-platform = 'host'
 spec = 'always'
 
 [metadata.target-platform]
-triple = 'armv6-unknown-netbsd-eabihf'
+triple = 'armv6-unknown-freebsd'
 target-features = 'unknown'
 [[metadata.omitted-packages.ids]]
 name = 'builddep'
diff --git a/fixtures/small/summaries/metadata_builddep-5.toml b/fixtures/small/summaries/metadata_builddep-5.toml
index 6ce3abcd149..bd3f75c5c87 100644
--- a/fixtures/small/summaries/metadata_builddep-5.toml
+++ b/fixtures/small/summaries/metadata_builddep-5.toml
@@ -7,7 +7,7 @@ include-dev = false
 initials-platform = 'standard'
 
 [metadata.host-platform]
-triple = 'wasm32-wasi'
+triple = 'wasm32-unknown-unknown'
 target-features = 'all'
 
 [metadata.target-platform]
diff --git a/fixtures/small/summaries/metadata_cycle1-1.toml b/fixtures/small/summaries/metadata_cycle1-1.toml
index 4682b32b365..a22c9147a7a 100644
--- a/fixtures/small/summaries/metadata_cycle1-1.toml
+++ b/fixtures/small/summaries/metadata_cycle1-1.toml
@@ -7,7 +7,7 @@ include-dev = false
 initials-platform = 'host'
 
 [metadata.host-platform]
-triple = 'x86_64-unknown-dragonfly'
+triple = 'x86_64-sun-solaris'
 target-features = 'unknown'
 flags = ['abc', 'bar']
 
diff --git a/fixtures/small/summaries/metadata_cycle1-6.toml b/fixtures/small/summaries/metadata_cycle1-6.toml
index c20f804b506..c0075592584 100644
--- a/fixtures/small/summaries/metadata_cycle1-6.toml
+++ b/fixtures/small/summaries/metadata_cycle1-6.toml
@@ -7,7 +7,7 @@ include-dev = false
 initials-platform = 'host'
 
 [metadata.host-platform]
-triple = 'armv4t-unknown-linux-gnueabi'
+triple = 'armv4t-none-eabi'
 target-features = 'all'
 flags = ['foo']
 
diff --git a/fixtures/small/summaries/metadata_cycle2-2.toml b/fixtures/small/summaries/metadata_cycle2-2.toml
index d1ff9e65696..aed20725576 100644
--- a/fixtures/small/summaries/metadata_cycle2-2.toml
+++ b/fixtures/small/summaries/metadata_cycle2-2.toml
@@ -7,7 +7,7 @@ include-dev = false
 initials-platform = 'host'
 
 [metadata.host-platform]
-triple = 'riscv32imac-unknown-xous-elf'
+triple = 'riscv32imac-unknown-none-elf'
 target-features = 'unknown'
 
 [metadata.target-platform]
diff --git a/fixtures/small/summaries/metadata_cycle2-3.toml b/fixtures/small/summaries/metadata_cycle2-3.toml
index d7cb4f198d5..af57b035f0a 100644
--- a/fixtures/small/summaries/metadata_cycle2-3.toml
+++ b/fixtures/small/summaries/metadata_cycle2-3.toml
@@ -10,7 +10,7 @@ initials-platform = 'proc-macros-on-target'
 spec = 'always'
 
 [metadata.target-platform]
-triple = 'wasm32-wasi'
+triple = 'wasm32-unknown-unknown'
 target-features = 'unknown'
 flags = ['bar']
 [[metadata.omitted-packages.ids]]
diff --git a/fixtures/small/summaries/metadata_cycle2-4.toml b/fixtures/small/summaries/metadata_cycle2-4.toml
index 9e4db011407..6371dee8aa4 100644
--- a/fixtures/small/summaries/metadata_cycle2-4.toml
+++ b/fixtures/small/summaries/metadata_cycle2-4.toml
@@ -7,7 +7,7 @@ include-dev = false
 initials-platform = 'proc-macros-on-target'
 
 [metadata.host-platform]
-triple = 'x86_64-unknown-linux-gnux32'
+triple = 'x86_64-unknown-linux-gnu'
 target-features = 'all'
 
 [metadata.target-platform]
diff --git a/fixtures/small/summaries/metadata_cycle2-5.toml b/fixtures/small/summaries/metadata_cycle2-5.toml
index e04e96472a8..975835b57cf 100644
--- a/fixtures/small/summaries/metadata_cycle2-5.toml
+++ b/fixtures/small/summaries/metadata_cycle2-5.toml
@@ -7,7 +7,7 @@ include-dev = true
 initials-platform = 'host'
 
 [metadata.host-platform]
-triple = 'armv7k-apple-watchos'
+triple = 'armv7a-none-eabihf'
 target-features = 'unknown'
 flags = ['bar']
 
diff --git a/fixtures/small/summaries/metadata_cycle2-6.toml b/fixtures/small/summaries/metadata_cycle2-6.toml
index d3313487f50..db2e2dbb92c 100644
--- a/fixtures/small/summaries/metadata_cycle2-6.toml
+++ b/fixtures/small/summaries/metadata_cycle2-6.toml
@@ -12,7 +12,7 @@ target-features = 'unknown'
 flags = ['bar', 'flag-test']
 
 [metadata.target-platform]
-triple = 'armv4t-unknown-linux-gnueabi'
+triple = 'armv4t-none-eabi'
 target-features = 'unknown'
 
 [[metadata.features-only]]
diff --git a/fixtures/small/summaries/metadata_cycle_features-2.toml b/fixtures/small/summaries/metadata_cycle_features-2.toml
index 3a28ca7f62c..73b86be5cea 100644
--- a/fixtures/small/summaries/metadata_cycle_features-2.toml
+++ b/fixtures/small/summaries/metadata_cycle_features-2.toml
@@ -10,7 +10,7 @@ initials-platform = 'proc-macros-on-target'
 spec = 'any'
 
 [metadata.target-platform]
-triple = 'armv5te-unknown-linux-gnueabi'
+triple = 'armv4t-unknown-linux-gnueabi'
 target-features = ['fma', 'rdrand', 'sha']
 flags = ['flag-test']
 [[metadata.omitted-packages.ids]]
diff --git a/fixtures/small/summaries/metadata_cycle_features-3.toml b/fixtures/small/summaries/metadata_cycle_features-3.toml
index 9ed88a7ca57..7be50cacbdc 100644
--- a/fixtures/small/summaries/metadata_cycle_features-3.toml
+++ b/fixtures/small/summaries/metadata_cycle_features-3.toml
@@ -7,12 +7,12 @@ include-dev = true
 initials-platform = 'proc-macros-on-target'
 
 [metadata.host-platform]
-triple = 'riscv64gc-unknown-none-elf'
+triple = 'riscv64gc-unknown-linux-musl'
 target-features = 'all'
 flags = ['foo']
 
 [metadata.target-platform]
-triple = 'i586-pc-windows-msvc'
+triple = 'i386-apple-ios'
 target-features = ['bmi2', 'sse', 'sse4.1']
 flags = ['bar', 'flag-test']
 [[metadata.omitted-packages.ids]]
diff --git a/fixtures/small/summaries/metadata_cycle_features-5.toml b/fixtures/small/summaries/metadata_cycle_features-5.toml
index 540b3ebb3cd..f0d7d8209c3 100644
--- a/fixtures/small/summaries/metadata_cycle_features-5.toml
+++ b/fixtures/small/summaries/metadata_cycle_features-5.toml
@@ -12,7 +12,7 @@ target-features = 'all'
 flags = ['cargo_web', 'foo']
 
 [metadata.target-platform]
-triple = 'i686-linux-android'
+triple = 'i686-apple-darwin'
 target-features = 'unknown'
 flags = ['cargo_web', 'foo']
 [[metadata.omitted-packages.ids]]
diff --git a/fixtures/small/summaries/metadata_cycle_features-7.toml b/fixtures/small/summaries/metadata_cycle_features-7.toml
index aaa8c5844a2..9c67f97f1cc 100644
--- a/fixtures/small/summaries/metadata_cycle_features-7.toml
+++ b/fixtures/small/summaries/metadata_cycle_features-7.toml
@@ -11,7 +11,7 @@ triple = 'x86_64-uwp-windows-gnu'
 target-features = 'all'
 
 [metadata.target-platform]
-triple = 'armv6-unknown-freebsd'
+triple = 'armv5te-unknown-linux-uclibceabi'
 target-features = 'all'
 
 [[target-package]]
diff --git a/fixtures/small/summaries/metadata_dups-0.toml b/fixtures/small/summaries/metadata_dups-0.toml
index 15bda2709cc..936ba3db79b 100644
--- a/fixtures/small/summaries/metadata_dups-0.toml
+++ b/fixtures/small/summaries/metadata_dups-0.toml
@@ -7,12 +7,12 @@ include-dev = false
 initials-platform = 'proc-macros-on-target'
 
 [metadata.host-platform]
-triple = 'x86_64-apple-tvos'
+triple = 'x86_64-apple-ios-macabi'
 target-features = 'all'
 flags = ['bar']
 
 [metadata.target-platform]
-triple = 'riscv32imac-unknown-none-elf'
+triple = 'riscv32im-unknown-none-elf'
 target-features = []
 flags = ['cargo_web', 'foo']
 [[metadata.omitted-packages.ids]]
diff --git a/fixtures/small/summaries/metadata_dups-3.toml b/fixtures/small/summaries/metadata_dups-3.toml
index 19bcb527d8f..b8d635232fd 100644
--- a/fixtures/small/summaries/metadata_dups-3.toml
+++ b/fixtures/small/summaries/metadata_dups-3.toml
@@ -7,7 +7,7 @@ include-dev = true
 initials-platform = 'standard'
 
 [metadata.host-platform]
-triple = 'x86_64-pc-windows-msvc'
+triple = 'x86_64-pc-windows-gnullvm'
 target-features = 'all'
 flags = ['test-flag']
 
diff --git a/fixtures/small/summaries/metadata_dups-4.toml b/fixtures/small/summaries/metadata_dups-4.toml
index b18cd6ab694..b43a9ce1a6c 100644
--- a/fixtures/small/summaries/metadata_dups-4.toml
+++ b/fixtures/small/summaries/metadata_dups-4.toml
@@ -7,12 +7,12 @@ include-dev = true
 initials-platform = 'host'
 
 [metadata.host-platform]
-triple = 'i686-wrs-vxworks'
+triple = 'i686-uwp-windows-msvc'
 target-features = 'unknown'
 flags = ['cargo_web']
 
 [metadata.target-platform]
-triple = 'x86_64-sun-solaris'
+triple = 'x86_64-pc-windows-msvc'
 target-features = 'all'
 [[metadata.omitted-packages.ids]]
 name = 'lazy_static'
diff --git a/fixtures/small/summaries/metadata_proc_macro1-0.toml b/fixtures/small/summaries/metadata_proc_macro1-0.toml
index 4238356f148..a4f72694d89 100644
--- a/fixtures/small/summaries/metadata_proc_macro1-0.toml
+++ b/fixtures/small/summaries/metadata_proc_macro1-0.toml
@@ -7,7 +7,7 @@ include-dev = true
 initials-platform = 'proc-macros-on-target'
 
 [metadata.host-platform]
-triple = 'riscv32i-unknown-none-elf'
+triple = 'riscv32gc-unknown-linux-musl'
 target-features = ['ssse3', 'xsaves']
 flags = ['cargo_web', 'foo']
 
diff --git a/fixtures/small/summaries/metadata_proc_macro1-2.toml b/fixtures/small/summaries/metadata_proc_macro1-2.toml
index bfec5f00fe2..8701ea346b8 100644
--- a/fixtures/small/summaries/metadata_proc_macro1-2.toml
+++ b/fixtures/small/summaries/metadata_proc_macro1-2.toml
@@ -7,7 +7,7 @@ include-dev = false
 initials-platform = 'proc-macros-on-target'
 
 [metadata.host-platform]
-triple = 's390x-unknown-linux-gnu'
+triple = 'riscv64gc-unknown-openbsd'
 target-features = ['fma', 'sse4.1']
 flags = ['flag-test']
 
diff --git a/fixtures/small/summaries/metadata_proc_macro1-7.toml b/fixtures/small/summaries/metadata_proc_macro1-7.toml
index 730d9ef9c6a..5616bd79d60 100644
--- a/fixtures/small/summaries/metadata_proc_macro1-7.toml
+++ b/fixtures/small/summaries/metadata_proc_macro1-7.toml
@@ -10,7 +10,7 @@ initials-platform = 'proc-macros-on-target'
 spec = 'any'
 
 [metadata.target-platform]
-triple = 'aarch64-unknown-none'
+triple = 'aarch64-unknown-none-softfloat'
 target-features = 'all'
 flags = ['abc', 'cargo_web']
 
diff --git a/fixtures/small/summaries/metadata_targets1-1.toml b/fixtures/small/summaries/metadata_targets1-1.toml
index e03ff1637a1..d9f99c4a8eb 100644
--- a/fixtures/small/summaries/metadata_targets1-1.toml
+++ b/fixtures/small/summaries/metadata_targets1-1.toml
@@ -7,7 +7,7 @@ include-dev = false
 initials-platform = 'host'
 
 [metadata.host-platform]
-triple = 'armv7a-kmc-solid_asp3-eabihf'
+triple = 'armv7a-kmc-solid_asp3-eabi'
 target-features = 'unknown'
 flags = ['abc', 'bar']
 
diff --git a/fixtures/small/summaries/metadata_targets1-2.toml b/fixtures/small/summaries/metadata_targets1-2.toml
index d56eab697cb..9773628ba5f 100644
--- a/fixtures/small/summaries/metadata_targets1-2.toml
+++ b/fixtures/small/summaries/metadata_targets1-2.toml
@@ -11,7 +11,7 @@ triple = 'mips64el-unknown-linux-muslabi64'
 target-features = 'unknown'
 
 [metadata.target-platform]
-triple = 'armv6-unknown-freebsd'
+triple = 'armv5te-unknown-linux-uclibceabi'
 target-features = 'unknown'
 flags = ['abc', 'bar']
 [[metadata.omitted-packages.ids]]
diff --git a/fixtures/small/summaries/metadata_targets1-4.toml b/fixtures/small/summaries/metadata_targets1-4.toml
index 2bd6a996259..c33ec29a9b2 100644
--- a/fixtures/small/summaries/metadata_targets1-4.toml
+++ b/fixtures/small/summaries/metadata_targets1-4.toml
@@ -7,7 +7,7 @@ include-dev = true
 initials-platform = 'standard'
 
 [metadata.host-platform]
-triple = 'x86_64-unknown-dragonfly'
+triple = 'x86_64-sun-solaris'
 target-features = []
 flags = ['foo']
 
diff --git a/fixtures/small/summaries/metadata_targets1-5.toml b/fixtures/small/summaries/metadata_targets1-5.toml
index 918c6df8d64..0a37a5456db 100644
--- a/fixtures/small/summaries/metadata_targets1-5.toml
+++ b/fixtures/small/summaries/metadata_targets1-5.toml
@@ -10,7 +10,7 @@ initials-platform = 'standard'
 spec = 'any'
 
 [metadata.target-platform]
-triple = 'armv7r-none-eabi'
+triple = 'armv7k-apple-watchos'
 target-features = []
 [[metadata.omitted-packages.ids]]
 name = 'bytes'
diff --git a/fixtures/small/summaries/metadata_targets1-6.toml b/fixtures/small/summaries/metadata_targets1-6.toml
index ef7b522c9d3..7331dc9c9a8 100644
--- a/fixtures/small/summaries/metadata_targets1-6.toml
+++ b/fixtures/small/summaries/metadata_targets1-6.toml
@@ -7,7 +7,7 @@ include-dev = false
 initials-platform = 'proc-macros-on-target'
 
 [metadata.host-platform]
-triple = 'riscv32imc-unknown-none-elf'
+triple = 'riscv32imc-esp-espidf'
 target-features = ['rdrand']
 flags = ['bar']
 
diff --git a/fixtures/small/summaries/metadata_weak_namespaced_features-0.toml b/fixtures/small/summaries/metadata_weak_namespaced_features-0.toml
index ad601c70535..5ef7b613676 100644
--- a/fixtures/small/summaries/metadata_weak_namespaced_features-0.toml
+++ b/fixtures/small/summaries/metadata_weak_namespaced_features-0.toml
@@ -10,7 +10,7 @@ initials-platform = 'host'
 spec = 'always'
 
 [metadata.target-platform]
-triple = 'armv7-unknown-freebsd'
+triple = 'armv7-linux-androideabi'
 target-features = 'unknown'
 flags = ['test-flag']
 [[metadata.omitted-packages.ids]]
diff --git a/fixtures/small/summaries/metadata_weak_namespaced_features-1.toml b/fixtures/small/summaries/metadata_weak_namespaced_features-1.toml
index 83bb47b4494..824390511d1 100644
--- a/fixtures/small/summaries/metadata_weak_namespaced_features-1.toml
+++ b/fixtures/small/summaries/metadata_weak_namespaced_features-1.toml
@@ -11,7 +11,7 @@ triple = 'mips-unknown-linux-musl'
 target-features = 'unknown'
 
 [metadata.target-platform]
-triple = 'arm-unknown-linux-gnueabihf'
+triple = 'arm-unknown-linux-musleabi'
 target-features = ['xsave', 'xsavec', 'xsaves']
 flags = ['bar', 'cargo_web']
 [[metadata.omitted-packages.ids]]
diff --git a/fixtures/small/summaries/metadata_weak_namespaced_features-2.toml b/fixtures/small/summaries/metadata_weak_namespaced_features-2.toml
index fce2f7b3a82..e956951bd10 100644
--- a/fixtures/small/summaries/metadata_weak_namespaced_features-2.toml
+++ b/fixtures/small/summaries/metadata_weak_namespaced_features-2.toml
@@ -10,7 +10,7 @@ initials-platform = 'host'
 spec = 'always'
 
 [metadata.target-platform]
-triple = 'x86_64-pc-windows-gnu'
+triple = 'x86_64-pc-solaris'
 target-features = ['avx2']
 [[metadata.omitted-packages.ids]]
 name = 'namespaced-weak'
diff --git a/fixtures/small/summaries/metadata_weak_namespaced_features-5.toml b/fixtures/small/summaries/metadata_weak_namespaced_features-5.toml
index 8c83225d708..45cfa8e9ad9 100644
--- a/fixtures/small/summaries/metadata_weak_namespaced_features-5.toml
+++ b/fixtures/small/summaries/metadata_weak_namespaced_features-5.toml
@@ -10,7 +10,7 @@ initials-platform = 'host'
 spec = 'always'
 
 [metadata.target-platform]
-triple = 'armv6-unknown-netbsd-eabihf'
+triple = 'armv6-unknown-freebsd'
 target-features = 'unknown'
 flags = ['abc', 'cargo_web']
 
diff --git a/fixtures/small/summaries/metadata_weak_namespaced_features-7.toml b/fixtures/small/summaries/metadata_weak_namespaced_features-7.toml
index a7ce41e34fe..7667d36ac35 100644
--- a/fixtures/small/summaries/metadata_weak_namespaced_features-7.toml
+++ b/fixtures/small/summaries/metadata_weak_namespaced_features-7.toml
@@ -7,7 +7,7 @@ include-dev = false
 initials-platform = 'host'
 
 [metadata.host-platform]
-triple = 'i686-apple-darwin'
+triple = 'i586-unknown-linux-musl'
 target-features = 'all'
 flags = ['abc']
 
diff --git a/target-spec/Cargo.toml b/target-spec/Cargo.toml
index f571196888f..ecb8dc4e337 100644
--- a/target-spec/Cargo.toml
+++ b/target-spec/Cargo.toml
@@ -20,7 +20,7 @@ rustdoc-args = ["--cfg=doc_cfg"]
 maintenance = { status = "actively-developed" }
 
 [dependencies]
-cfg-expr = { version = "0.11.0", features = ["targets"] }
+cfg-expr = { version = "0.12.0", features = ["targets"] }
 proptest = { version = "1.0.0", optional = true }
 serde = { version = "1.0.147", optional = true, features = ["derive"] }
 target-lexicon = { version = "0.12.4", features = ["std"] }
diff --git a/target-spec/src/spec.rs b/target-spec/src/spec.rs
index 46c56fa6acc..7e2a780005e 100644
--- a/target-spec/src/spec.rs
+++ b/target-spec/src/spec.rs
@@ -149,7 +149,7 @@ impl FromStr for TargetExpression {
 mod tests {
     use super::*;
     use cfg_expr::{
-        targets::{Family, Os},
+        targets::{Abi, Arch, Family, Os},
         Predicate, TargetPredicate,
     };
 
@@ -176,6 +176,27 @@ mod tests {
         );
     }
 
+    #[test]
+    fn test_target_abi() {
+        let expr =
+            match TargetSpec::new("cfg(any(target_arch = \"wasm32\", target_abi = \"unknown\"))")
+                .unwrap()
+            {
+                TargetSpec::Triple(triple) => {
+                    panic!("expected expression, got triple: {:?}", triple)
+                }
+                TargetSpec::Expression(expr) => expr,
+            };
+
+        assert_eq!(
+            expr.inner.predicates().collect::<Vec<_>>(),
+            vec![
+                Predicate::Target(TargetPredicate::Arch(Arch("wasm32".into()))),
+                Predicate::Target(TargetPredicate::Abi(Abi("unknown".into()))),
+            ],
+        );
+    }
+
     #[test]
     fn test_not() {
         assert!(matches!(