From b74166bc78d7356add526289848fe0fd087a36ec Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Tue, 10 Nov 2020 09:47:24 +1000
Subject: [PATCH] update to cargo-raze 0.7.0 + latest deps

Gives us wildcard entries in raze.toml, and solves warnings about
unrecognized "raze" entries.
---
 cargo/BUILD.bazel                             |   6 +-
 cargo/Cargo.lock                              |  71 +-
 cargo/README.md                               |  13 +-
 cargo/crates.bzl                              | 666 +++++++++---------
 cargo/raze.toml                               |   8 +-
 ...ILD.bazel => BUILD.addr2line-0.14.0.bazel} |  20 +-
 ....3.BUILD.bazel => BUILD.adler-0.2.3.bazel} |  17 +-
 ....6.BUILD.bazel => BUILD.ahash-0.4.6.bazel} |  21 +-
 ....bazel => BUILD.aho-corasick-0.7.15.bazel} |  32 +-
 ....BUILD.bazel => BUILD.anyhow-1.0.34.bazel} |  67 +-
 ...BUILD.bazel => BUILD.arc-swap-0.4.7.bazel} |  17 +-
 ...BUILD.bazel => BUILD.arrayref-0.3.6.bazel} |  19 +-
 ...UILD.bazel => BUILD.arrayvec-0.4.12.bazel} |  61 +-
 ...BUILD.bazel => BUILD.arrayvec-0.5.2.bazel} |  36 +-
 ....BUILD.bazel => BUILD.askama-0.10.3.bazel} |  40 +-
 ...bazel => BUILD.askama_derive-0.10.3.bazel} |  30 +-
 ...bazel => BUILD.askama_escape-0.10.1.bazel} |  15 +-
 ...bazel => BUILD.askama_shared-0.10.4.bazel} |  42 +-
 ...el => BUILD.async-compression-0.3.6.bazel} |  53 +-
 ...14.BUILD.bazel => BUILD.atty-0.2.14.bazel} |  35 +-
 ....BUILD.bazel => BUILD.autocfg-1.0.1.bazel} |  27 +-
 ...ILD.bazel => BUILD.backtrace-0.3.54.bazel} |  60 +-
 ....BUILD.bazel => BUILD.base64-0.12.3.bazel} |  40 +-
 ....BUILD.bazel => BUILD.base64-0.13.0.bazel} |  41 +-
 ...BUILD.bazel => BUILD.bitflags-1.2.1.bazel} |  39 +-
 ....bazel => BUILD.blake2b_simd-0.5.11.bazel} |  34 +-
 ...7.BUILD.bazel => BUILD.blake3-0.3.7.bazel} |  58 +-
 ....BUILD.bazel => BUILD.bumpalo-3.4.0.bazel} |  29 +-
 ...UILD.bazel => BUILD.byteorder-1.3.4.bazel} |  54 +-
 ...2.BUILD.bazel => BUILD.bytes-0.4.12.bazel} |  29 +-
 ....6.BUILD.bazel => BUILD.bytes-0.5.6.bazel} |  46 +-
 ...0.61.BUILD.bazel => BUILD.cc-1.0.62.bazel} |  68 +-
 ....BUILD.bazel => BUILD.cfg-if-0.1.10.bazel} |  15 +-
 ...0.BUILD.bazel => BUILD.cfg-if-1.0.0.bazel} |  15 +-
 ....BUILD.bazel => BUILD.chrono-0.4.19.bazel} |  53 +-
 ...BUILD.bazel => BUILD.cloudabi-0.1.0.bazel} |  32 +-
 cargo/remote/BUILD.coarsetime-0.1.14.bazel    |  70 ++
 ...zel => BUILD.constant_time_eq-0.1.5.bazel} |  15 +-
 ...azel => BUILD.core-foundation-0.7.0.bazel} |  19 +-
 ... => BUILD.core-foundation-sys-0.7.0.bazel} |  35 +-
 ...UILD.bazel => BUILD.crc32fast-1.2.1.bazel} |  56 +-
 ...el => BUILD.crossbeam-channel-0.4.4.bazel} |  46 +-
 ...azel => BUILD.crossbeam-utils-0.7.2.bazel} |  72 +-
 ...ILD.bazel => BUILD.crypto-mac-0.8.0.bazel} |  18 +-
 ...16.BUILD.bazel => BUILD.ctor-0.1.16.bazel} |  21 +-
 ...ILD.bazel => BUILD.derivative-2.1.1.bazel} | 100 ++-
 ...0.BUILD.bazel => BUILD.digest-0.9.0.bazel} |  32 +-
 ...0.2.BUILD.bazel => BUILD.dirs-2.0.2.bazel} |  18 +-
 ...BUILD.bazel => BUILD.dirs-sys-0.3.5.bazel} |  34 +-
 ...4.6.BUILD.bazel => BUILD.dtoa-0.4.6.bazel} |  16 +-
 ...1.BUILD.bazel => BUILD.either-1.6.1.bazel} |  30 +-
 ...D.bazel => BUILD.encoding_rs-0.8.26.bazel} |  37 +-
 ...ILD.bazel => BUILD.env_logger-0.8.1.bazel} |  58 +-
 ....BUILD.bazel => BUILD.failure-0.1.8.bazel} |  57 +-
 ...bazel => BUILD.failure_derive-0.1.8.bazel} |  58 +-
 ...el => BUILD.fallible-iterator-0.2.0.bazel} |  30 +-
 ...D.fallible-streaming-iterator-0.1.9.bazel} |  14 +-
 ...LD.bazel => BUILD.fixedbitset-0.2.0.bazel} |  15 +-
 ....BUILD.bazel => BUILD.flate2-1.0.19.bazel} | 114 +--
 ....BUILD.bazel => BUILD.fluent-0.13.1.bazel} |  18 +-
 ...bazel => BUILD.fluent-bundle-0.13.1.bazel} |  33 +-
 ...azel => BUILD.fluent-langneg-0.13.0.bazel} |  21 +-
 ...bazel => BUILD.fluent-syntax-0.10.0.bazel} |  82 +--
 ....0.7.BUILD.bazel => BUILD.fnv-1.0.7.bazel} |  30 +-
 .../remote/BUILD.form_urlencoded-1.0.0.bazel  |  54 ++
 ...bazel => BUILD.fuchsia-zircon-0.3.3.bazel} |  18 +-
 ...l => BUILD.fuchsia-zircon-sys-0.3.3.bazel} |  17 +-
 ....BUILD.bazel => BUILD.futures-0.3.8.bazel} | 121 +++-
 ...azel => BUILD.futures-channel-0.3.8.bazel} |  43 +-
 ...D.bazel => BUILD.futures-core-0.3.8.bazel} |  30 +-
 ...zel => BUILD.futures-executor-0.3.8.bazel} |  26 +-
 ...ILD.bazel => BUILD.futures-io-0.3.8.bazel} |  16 +-
 ....bazel => BUILD.futures-macro-0.3.8.bazel} |  20 +-
 ...D.bazel => BUILD.futures-sink-0.3.8.bazel} |  30 +-
 ...D.bazel => BUILD.futures-task-0.3.8.bazel} |  32 +-
 ...D.bazel => BUILD.futures-util-0.3.8.bazel} |  61 +-
 ...1.BUILD.bazel => BUILD.fxhash-0.2.1.bazel} |  17 +-
 ...bazel => BUILD.generic-array-0.14.4.bazel} |  47 +-
 ...ILD.bazel => BUILD.getrandom-0.1.15.bazel} |  69 +-
 ....2.BUILD.bazel => BUILD.ghost-0.1.2.bazel} |  30 +-
 ...0.BUILD.bazel => BUILD.gimli-0.23.0.bazel} |  29 +-
 ...0.2.7.BUILD.bazel => BUILD.h2-0.2.7.bazel} |  41 +-
 ...UILD.bazel => BUILD.hashbrown-0.9.1.bazel} |  37 +-
 ...BUILD.bazel => BUILD.hashlink-0.6.0.bazel} |  20 +-
 ...3.1.BUILD.bazel => BUILD.heck-0.3.1.bazel} |  16 +-
 ...LD.bazel => BUILD.hermit-abi-0.1.17.bazel} |  18 +-
 ....4.2.BUILD.bazel => BUILD.hex-0.4.2.bazel} |  33 +-
 ...ILD.bazel => BUILD.htmlescape-0.3.1.bazel} |  16 +-
 ...2.1.BUILD.bazel => BUILD.http-0.2.1.bazel} |  43 +-
 ...UILD.bazel => BUILD.http-body-0.3.1.bazel} |  19 +-
 ...BUILD.bazel => BUILD.httparse-1.3.4.bazel} |  57 +-
 ...BUILD.bazel => BUILD.httpdate-0.3.2.bazel} |  14 +-
 ...UILD.bazel => BUILD.humansize-1.1.0.bazel} |  18 +-
 ...UILD.bazel => BUILD.humantime-2.0.1.bazel} |  16 +-
 ...9.BUILD.bazel => BUILD.hyper-0.13.9.bazel} | 100 ++-
 ....bazel => BUILD.hyper-rustls-0.21.0.bazel} |  37 +-
 ....bazel => BUILD.hyper-timeout-0.3.1.bazel} |  31 +-
 ...2.0.BUILD.bazel => BUILD.idna-0.2.0.bazel} |  32 +-
 ...BUILD.bazel => BUILD.indexmap-1.6.0.bazel} |  45 +-
 ....6.BUILD.bazel => BUILD.indoc-0.3.6.bazel} |  18 +-
 ...ILD.bazel => BUILD.indoc-impl-0.3.6.bazel} |  22 +-
 ....BUILD.bazel => BUILD.instant-0.1.8.bazel} |  17 +-
 ....bazel => BUILD.intl-memoizer-0.5.0.bazel} |  18 +-
 ...zel => BUILD.intl_pluralrules-7.0.0.bazel} |  21 +-
 ...UILD.bazel => BUILD.inventory-0.1.9.bazel} |  34 +-
 ...bazel => BUILD.inventory-impl-0.1.9.bazel} |  30 +-
 ....4.BUILD.bazel => BUILD.iovec-0.1.4.bazel} |  34 +-
 ....0.BUILD.bazel => BUILD.ipnet-2.3.0.bazel} |  14 +-
 ...UILD.bazel => BUILD.itertools-0.9.0.bazel} |  59 +-
 ...4.6.BUILD.bazel => BUILD.itoa-0.4.6.bazel} |  32 +-
 ....BUILD.bazel => BUILD.js-sys-0.3.45.bazel} |  20 +-
 ...D.bazel => BUILD.kernel32-sys-0.2.2.bazel} |  39 +-
 ...LD.bazel => BUILD.lazy_static-1.4.0.bazel} |  16 +-
 ...D.bazel => BUILD.lexical-core-0.7.4.bazel} | 101 ++-
 ...80.BUILD.bazel => BUILD.libc-0.2.80.bazel} |  58 +-
 ...azel => BUILD.libsqlite3-sys-0.20.1.bazel} | 133 ++--
 ...BUILD.bazel => BUILD.lock_api-0.4.1.bazel} |  16 +-
 ....11.BUILD.bazel => BUILD.log-0.4.11.bazel} |  45 +-
 ....BUILD.bazel => BUILD.matches-0.1.8.bazel} |  17 +-
 ...D.bazel => BUILD.maybe-uninit-2.0.0.bazel} |  38 +-
 ...4.BUILD.bazel => BUILD.memchr-2.3.4.bazel} |  57 +-
 ...16.BUILD.bazel => BUILD.mime-0.3.16.bazel} |  19 +-
 ...ILD.bazel => BUILD.mime_guess-2.0.3.bazel} |  61 +-
 ...LD.bazel => BUILD.miniz_oxide-0.4.3.bazel} |  39 +-
 ....22.BUILD.bazel => BUILD.mio-0.6.22.bazel} |  39 +-
 ...2.1.BUILD.bazel => BUILD.miow-0.2.1.bazel} |  30 +-
 ...BUILD.bazel => BUILD.multimap-0.8.2.bazel} |  14 +-
 ...35.BUILD.bazel => BUILD.net2-0.2.35.bazel} |  38 +-
 ....BUILD.bazel => BUILD.nodrop-0.1.14.bazel} |  14 +-
 ....1.2.BUILD.bazel => BUILD.nom-5.1.2.bazel} | 168 +++--
 ...ILD.bazel => BUILD.num-format-0.4.0.bazel} |  47 +-
 ...D.bazel => BUILD.num-integer-0.1.44.bazel} |  66 +-
 ...LD.bazel => BUILD.num-traits-0.2.14.bazel} |  60 +-
 ...UILD.bazel => BUILD.num_cpus-1.13.0.bazel} |  19 +-
 ...BUILD.bazel => BUILD.num_enum-0.5.1.bazel} |  28 +-
 ...azel => BUILD.num_enum_derive-0.5.1.bazel} |  38 +-
 ....BUILD.bazel => BUILD.object-0.22.0.bazel} |  41 +-
 ...UILD.bazel => BUILD.once_cell-1.4.1.bazel} |  44 +-
 ....bazel => BUILD.openssl-probe-0.1.2.bazel} |  14 +-
 ...D.bazel => BUILD.parking_lot-0.11.0.bazel} |  35 +-
 ...zel => BUILD.parking_lot_core-0.8.0.bazel} |  34 +-
 ...8.BUILD.bazel => BUILD.paste-0.1.18.bazel} |  18 +-
 ...LD.bazel => BUILD.paste-impl-0.1.18.bazel} |  14 +-
 ...zel => BUILD.percent-encoding-2.1.0.bazel} |  14 +-
 ...BUILD.bazel => BUILD.petgraph-0.5.1.bazel} |  40 +-
 ...D.bazel => BUILD.pin-project-0.4.27.bazel} |  62 +-
 ...LD.bazel => BUILD.pin-project-1.0.1.bazel} |  59 +-
 ...> BUILD.pin-project-internal-0.4.27.bazel} |  49 +-
 ...=> BUILD.pin-project-internal-1.0.1.bazel} |  30 +-
 ...el => BUILD.pin-project-lite-0.1.11.bazel} |  22 +-
 ...UILD.bazel => BUILD.pin-utils-0.1.0.bazel} |  16 +-
 ...LD.bazel => BUILD.pkg-config-0.3.19.bazel} |  15 +-
 ....7.BUILD.bazel => BUILD.podio-0.1.7.bazel} |  23 +-
 ...LD.bazel => BUILD.ppv-lite86-0.2.10.bazel} |  30 +-
 ...zel => BUILD.proc-macro-crate-0.1.5.bazel} |  16 +-
 ...zel => BUILD.proc-macro-hack-0.5.19.bazel} |  38 +-
 ...el => BUILD.proc-macro-nested-0.1.6.bazel} |  35 +-
 ...D.bazel => BUILD.proc-macro2-1.0.24.bazel} |  68 +-
 ....1.BUILD.bazel => BUILD.prost-0.6.1.bazel} |  25 +-
 ...LD.bazel => BUILD.prost-build-0.6.1.bazel} |  51 +-
 ...D.bazel => BUILD.prost-derive-0.6.1.bazel} |  30 +-
 ...LD.bazel => BUILD.prost-types-0.6.1.bazel} |  18 +-
 ....3.BUILD.bazel => BUILD.pyo3-0.12.3.bazel} | 164 +++--
 ...=> BUILD.pyo3-derive-backend-0.12.3.bazel} |  30 +-
 ...BUILD.bazel => BUILD.pyo3cls-0.12.3.bazel} |  30 +-
 ....7.BUILD.bazel => BUILD.quote-1.0.7.bazel} |  36 +-
 ...7.3.BUILD.bazel => BUILD.rand-0.7.3.bazel} |  58 +-
 ...LD.bazel => BUILD.rand_chacha-0.2.2.bazel} |  20 +-
 ...UILD.bazel => BUILD.rand_core-0.5.1.bazel} |  32 +-
 ....BUILD.bazel => BUILD.rand_hc-0.2.0.bazel} |  16 +-
 ...bazel => BUILD.redox_syscall-0.1.57.bazel} |  14 +-
 ...LD.bazel => BUILD.redox_users-0.3.5.bazel} |  36 +-
 ....2.BUILD.bazel => BUILD.regex-1.4.2.bazel} |  83 ++-
 ....bazel => BUILD.regex-syntax-0.6.21.bazel} |  31 +-
 ...bazel => BUILD.remove_dir_all-0.5.3.bazel} |  34 +-
 ...5.BUILD.bazel => BUILD.rental-0.5.5.bazel} |  55 +-
 ...LD.bazel => BUILD.rental-impl-0.5.5.bazel} |  30 +-
 ...BUILD.bazel => BUILD.reqwest-0.10.8.bazel} | 110 +--
 ...5.BUILD.bazel => BUILD.ring-0.16.15.bazel} | 114 +--
 ...UILD.bazel => BUILD.rusqlite-0.24.1.bazel} |  49 +-
 ...LD.bazel => BUILD.rust-argon2-0.8.2.bazel} |  35 +-
 ...azel => BUILD.rustc-demangle-0.1.18.bazel} |  14 +-
 ....BUILD.bazel => BUILD.rustls-0.18.1.bazel} |  59 +-
 ... => BUILD.rustls-native-certs-0.4.0.bazel} |  39 +-
 ....0.5.BUILD.bazel => BUILD.ryu-1.0.5.bazel} |  54 +-
 ...UILD.bazel => BUILD.schannel-0.1.19.bazel} |  18 +-
 ...ILD.bazel => BUILD.scopeguard-1.1.0.bazel} |  31 +-
 ....6.0.BUILD.bazel => BUILD.sct-0.6.0.bazel} |  18 +-
 ...l => BUILD.security-framework-1.0.0.bazel} |  39 +-
 ... BUILD.security-framework-sys-1.0.0.bazel} |  20 +-
 ....BUILD.bazel => BUILD.serde-1.0.117.bazel} |  51 +-
 ...UILD.bazel => BUILD.serde-aux-0.6.1.bazel} |  24 +-
 ...bazel => BUILD.serde_derive-1.0.117.bazel} |  53 +-
 ...LD.bazel => BUILD.serde_json-1.0.59.bazel} |  57 +-
 ...ILD.bazel => BUILD.serde_repr-0.1.6.bazel} |  34 +-
 ...LD.bazel => BUILD.serde_tuple-0.5.0.bazel} |  19 +-
 ...l => BUILD.serde_tuple_macros-0.5.0.bazel} |  30 +-
 ...zel => BUILD.serde_urlencoded-0.6.1.bazel} |  24 +-
 ...6.0.BUILD.bazel => BUILD.sha1-0.6.0.bazel} |  14 +-
 ...4.2.BUILD.bazel => BUILD.slab-0.4.2.bazel} |  15 +-
 ...5.2.BUILD.bazel => BUILD.slog-2.5.2.bazel} |  92 +--
 ...ILD.bazel => BUILD.slog-async-2.5.0.bazel} |  32 +-
 ...bazel => BUILD.slog-envlogger-2.2.0.bazel} |  40 +-
 ...ILD.bazel => BUILD.slog-scope-4.3.0.bazel} |  31 +-
 ...LD.bazel => BUILD.slog-stdlog-4.1.0.bazel} |  30 +-
 ...UILD.bazel => BUILD.slog-term-2.6.0.bazel} |  39 +-
 ...BUILD.bazel => BUILD.smallvec-1.4.2.bazel} |  20 +-
 ...BUILD.bazel => BUILD.socket2-0.3.15.bazel} |  34 +-
 ...5.2.BUILD.bazel => BUILD.spin-0.5.2.bazel} |  15 +-
 ...l => BUILD.stable_deref_trait-1.2.0.bazel} |  30 +-
 ...el => BUILD.static_assertions-1.1.0.bazel} |  14 +-
 ...0.BUILD.bazel => BUILD.subtle-2.3.0.bazel} |  17 +-
 ....48.BUILD.bazel => BUILD.syn-1.0.48.bazel} | 139 ++--
 ....bazel => BUILD.synstructure-0.12.4.bazel} |  34 +-
 ...BUILD.bazel => BUILD.take_mut-0.2.2.bazel} |  14 +-
 ...BUILD.bazel => BUILD.tempfile-3.1.0.bazel} |  44 +-
 ...6.1.BUILD.bazel => BUILD.term-0.6.1.bazel} |  37 +-
 ...UILD.bazel => BUILD.termcolor-1.1.0.bazel} |  34 +-
 ...ILD.bazel => BUILD.thiserror-1.0.22.bazel} |  52 +-
 ...azel => BUILD.thiserror-impl-1.0.22.bazel} |  30 +-
 ...D.bazel => BUILD.thread_local-1.0.1.bazel} |  17 +-
 ...44.BUILD.bazel => BUILD.time-0.1.44.bazel} |  34 +-
 ....BUILD.bazel => BUILD.tinystr-0.3.4.bazel} |  38 +-
 ....BUILD.bazel => BUILD.tinyvec-0.3.4.bazel} |  35 +-
 ...2.BUILD.bazel => BUILD.tokio-0.2.22.bazel} | 355 ++++++----
 ...zel => BUILD.tokio-io-timeout-0.4.0.bazel} |  18 +-
 ....bazel => BUILD.tokio-rustls-0.14.1.bazel} |  31 +-
 ...LD.bazel => BUILD.tokio-socks-0.3.0.bazel} |  38 +-
 ...ILD.bazel => BUILD.tokio-util-0.3.1.bazel} |  58 +-
 ...5.7.BUILD.bazel => BUILD.toml-0.5.7.bazel} |  30 +-
 ....bazel => BUILD.tower-service-0.3.0.bazel} |  14 +-
 ...BUILD.bazel => BUILD.tracing-0.1.21.bazel} |  73 +-
 ....bazel => BUILD.tracing-core-0.1.17.bazel} |  41 +-
 ...azel => BUILD.tracing-futures-0.2.4.bazel} |  40 +-
 ...BUILD.bazel => BUILD.try-lock-0.2.3.bazel} |  14 +-
 ...BUILD.bazel => BUILD.type-map-0.3.0.bazel} |  16 +-
 ...BUILD.bazel => BUILD.typenum-1.12.0.bazel} |  38 +-
 ...LD.bazel => BUILD.unic-langid-0.9.0.bazel} |  34 +-
 ...zel => BUILD.unic-langid-impl-0.9.0.bazel} |  69 +-
 ...l => BUILD.unic-langid-macros-0.9.0.bazel} |  18 +-
 ...BUILD.unic-langid-macros-impl-0.9.0.bazel} |  20 +-
 ....BUILD.bazel => BUILD.unicase-2.6.0.bazel} |  37 +-
 ...D.bazel => BUILD.unicode-bidi-0.3.4.bazel} |  18 +-
 ... BUILD.unicode-normalization-0.1.13.bazel} |  33 +-
 ...=> BUILD.unicode-segmentation-1.6.0.bazel} |  14 +-
 ...LD.bazel => BUILD.unicode-xid-0.2.1.bazel} |  19 +-
 ...BUILD.bazel => BUILD.unindent-0.1.7.bazel} |  14 +-
 ...UILD.bazel => BUILD.untrusted-0.7.1.bazel} |  17 +-
 ....1.1.BUILD.bazel => BUILD.url-2.2.0.bazel} |  28 +-
 ....1.BUILD.bazel => BUILD.utime-0.3.1.bazel} |  35 +-
 ...0.BUILD.bazel => BUILD.vcpkg-0.2.10.bazel} |  14 +-
 ....bazel => BUILD.version_check-0.9.2.bazel} |  14 +-
 ...3.0.BUILD.bazel => BUILD.want-0.3.0.bazel} |  19 +-
 ....wasi-0.10.0+wasi-snapshot-preview1.bazel} |  30 +-
 ...D.wasi-0.9.0+wasi-snapshot-preview1.bazel} |  30 +-
 ....bazel => BUILD.wasm-bindgen-0.2.68.bazel} | 119 ++--
 ...> BUILD.wasm-bindgen-backend-0.2.68.bazel} |  32 +-
 ...> BUILD.wasm-bindgen-futures-0.4.18.bazel} |  33 +-
 ... => BUILD.wasm-bindgen-macro-0.2.68.bazel} |  23 +-
 ...D.wasm-bindgen-macro-support-0.2.68.bazel} |  32 +-
 ...=> BUILD.wasm-bindgen-shared-0.2.68.bazel} |  35 +-
 ...BUILD.bazel => BUILD.web-sys-0.3.45.bazel} |  37 +-
 ....BUILD.bazel => BUILD.webpki-0.21.3.bazel} |  42 +-
 ....2.BUILD.bazel => BUILD.which-4.0.2.bazel} |  21 +-
 ...8.BUILD.bazel => BUILD.winapi-0.2.8.bazel} |  14 +-
 ...9.BUILD.bazel => BUILD.winapi-0.3.9.bazel} | 147 ++--
 ...D.bazel => BUILD.winapi-build-0.1.1.bazel} |  14 +-
 ...LD.winapi-i686-pc-windows-gnu-0.4.0.bazel} |  35 +-
 ...LD.bazel => BUILD.winapi-util-0.1.5.bazel} |  34 +-
 ....winapi-x86_64-pc-windows-gnu-0.4.0.bazel} |  35 +-
 ...0.BUILD.bazel => BUILD.winreg-0.7.0.bazel} |  21 +-
 ...ILD.bazel => BUILD.ws2_32-sys-0.2.1.bazel} |  39 +-
 ....5.6.BUILD.bazel => BUILD.zip-0.5.6.bazel} |  56 +-
 cargo/remote/coarsetime-0.1.14.BUILD.bazel    |  54 --
 274 files changed, 6072 insertions(+), 5143 deletions(-)
 rename cargo/remote/{addr2line-0.14.0.BUILD.bazel => BUILD.addr2line-0.14.0.bazel} (95%)
 rename cargo/remote/{adler-0.2.3.BUILD.bazel => BUILD.adler-0.2.3.bazel} (95%)
 rename cargo/remote/{ahash-0.4.6.BUILD.bazel => BUILD.ahash-0.4.6.bazel} (95%)
 rename cargo/remote/{aho-corasick-0.7.14.BUILD.bazel => BUILD.aho-corasick-0.7.15.bazel} (93%)
 rename cargo/remote/{anyhow-1.0.34.BUILD.bazel => BUILD.anyhow-1.0.34.bazel} (94%)
 rename cargo/remote/{arc-swap-0.4.7.BUILD.bazel => BUILD.arc-swap-0.4.7.bazel} (95%)
 rename cargo/remote/{arrayref-0.3.6.BUILD.bazel => BUILD.arrayref-0.3.6.bazel} (95%)
 rename cargo/remote/{arrayvec-0.4.12.BUILD.bazel => BUILD.arrayvec-0.4.12.bazel} (93%)
 rename cargo/remote/{arrayvec-0.5.2.BUILD.bazel => BUILD.arrayvec-0.5.2.bazel} (95%)
 rename cargo/remote/{askama-0.10.3.BUILD.bazel => BUILD.askama-0.10.3.bazel} (96%)
 rename cargo/remote/{askama_derive-0.10.3.BUILD.bazel => BUILD.askama_derive-0.10.3.bazel} (95%)
 rename cargo/remote/{askama_escape-0.10.1.BUILD.bazel => BUILD.askama_escape-0.10.1.bazel} (95%)
 rename cargo/remote/{askama_shared-0.10.4.BUILD.bazel => BUILD.askama_shared-0.10.4.bazel} (96%)
 rename cargo/remote/{async-compression-0.3.5.BUILD.bazel => BUILD.async-compression-0.3.6.bazel} (86%)
 rename cargo/remote/{atty-0.2.14.BUILD.bazel => BUILD.atty-0.2.14.bazel} (97%)
 rename cargo/remote/{autocfg-1.0.1.BUILD.bazel => BUILD.autocfg-1.0.1.bazel} (95%)
 rename cargo/remote/{backtrace-0.3.54.BUILD.bazel => BUILD.backtrace-0.3.54.bazel} (97%)
 rename cargo/remote/{base64-0.12.3.BUILD.bazel => BUILD.base64-0.12.3.bazel} (95%)
 rename cargo/remote/{base64-0.13.0.BUILD.bazel => BUILD.base64-0.13.0.bazel} (96%)
 rename cargo/remote/{bitflags-1.2.1.BUILD.bazel => BUILD.bitflags-1.2.1.bazel} (92%)
 rename cargo/remote/{blake2b_simd-0.5.11.BUILD.bazel => BUILD.blake2b_simd-0.5.11.bazel} (95%)
 rename cargo/remote/{blake3-0.3.7.BUILD.bazel => BUILD.blake3-0.3.7.bazel} (91%)
 rename cargo/remote/{bumpalo-3.4.0.BUILD.bazel => BUILD.bumpalo-3.4.0.bazel} (96%)
 rename cargo/remote/{byteorder-1.3.4.BUILD.bazel => BUILD.byteorder-1.3.4.bazel} (92%)
 rename cargo/remote/{bytes-0.4.12.BUILD.bazel => BUILD.bytes-0.4.12.bazel} (96%)
 rename cargo/remote/{bytes-0.5.6.BUILD.bazel => BUILD.bytes-0.5.6.bazel} (96%)
 rename cargo/remote/{cc-1.0.61.BUILD.bazel => BUILD.cc-1.0.62.bazel} (92%)
 rename cargo/remote/{cfg-if-0.1.10.BUILD.bazel => BUILD.cfg-if-0.1.10.bazel} (95%)
 rename cargo/remote/{cfg-if-1.0.0.BUILD.bazel => BUILD.cfg-if-1.0.0.bazel} (95%)
 rename cargo/remote/{chrono-0.4.19.BUILD.bazel => BUILD.chrono-0.4.19.bazel} (97%)
 rename cargo/remote/{cloudabi-0.1.0.BUILD.bazel => BUILD.cloudabi-0.1.0.bazel} (95%)
 create mode 100644 cargo/remote/BUILD.coarsetime-0.1.14.bazel
 rename cargo/remote/{constant_time_eq-0.1.5.BUILD.bazel => BUILD.constant_time_eq-0.1.5.bazel} (95%)
 rename cargo/remote/{core-foundation-0.7.0.BUILD.bazel => BUILD.core-foundation-0.7.0.bazel} (95%)
 rename cargo/remote/{core-foundation-sys-0.7.0.BUILD.bazel => BUILD.core-foundation-sys-0.7.0.bazel} (93%)
 rename cargo/remote/{crc32fast-1.2.1.BUILD.bazel => BUILD.crc32fast-1.2.1.bazel} (92%)
 rename cargo/remote/{crossbeam-channel-0.4.4.BUILD.bazel => BUILD.crossbeam-channel-0.4.4.bazel} (96%)
 rename cargo/remote/{crossbeam-utils-0.7.2.BUILD.bazel => BUILD.crossbeam-utils-0.7.2.bazel} (93%)
 rename cargo/remote/{crypto-mac-0.8.0.BUILD.bazel => BUILD.crypto-mac-0.8.0.bazel} (95%)
 rename cargo/remote/{ctor-0.1.16.BUILD.bazel => BUILD.ctor-0.1.16.bazel} (95%)
 rename cargo/remote/{derivative-2.1.1.BUILD.bazel => BUILD.derivative-2.1.1.bazel} (98%)
 rename cargo/remote/{digest-0.9.0.BUILD.bazel => BUILD.digest-0.9.0.bazel} (95%)
 rename cargo/remote/{dirs-2.0.2.BUILD.bazel => BUILD.dirs-2.0.2.bazel} (95%)
 rename cargo/remote/{dirs-sys-0.3.5.BUILD.bazel => BUILD.dirs-sys-0.3.5.bazel} (97%)
 rename cargo/remote/{dtoa-0.4.6.BUILD.bazel => BUILD.dtoa-0.4.6.bazel} (95%)
 rename cargo/remote/{either-1.6.1.BUILD.bazel => BUILD.either-1.6.1.bazel} (95%)
 rename cargo/remote/{encoding_rs-0.8.26.BUILD.bazel => BUILD.encoding_rs-0.8.26.bazel} (93%)
 rename cargo/remote/{env_logger-0.8.1.BUILD.bazel => BUILD.env_logger-0.8.1.bazel} (97%)
 rename cargo/remote/{failure-0.1.8.BUILD.bazel => BUILD.failure-0.1.8.bazel} (96%)
 rename cargo/remote/{failure_derive-0.1.8.BUILD.bazel => BUILD.failure_derive-0.1.8.bazel} (95%)
 rename cargo/remote/{fallible-iterator-0.2.0.BUILD.bazel => BUILD.fallible-iterator-0.2.0.bazel} (95%)
 rename cargo/remote/{fallible-streaming-iterator-0.1.9.BUILD.bazel => BUILD.fallible-streaming-iterator-0.1.9.bazel} (95%)
 rename cargo/remote/{fixedbitset-0.2.0.BUILD.bazel => BUILD.fixedbitset-0.2.0.bazel} (95%)
 rename cargo/remote/{flate2-1.0.19.BUILD.bazel => BUILD.flate2-1.0.19.bazel} (97%)
 rename cargo/remote/{fluent-0.13.1.BUILD.bazel => BUILD.fluent-0.13.1.bazel} (95%)
 rename cargo/remote/{fluent-bundle-0.13.1.BUILD.bazel => BUILD.fluent-bundle-0.13.1.bazel} (96%)
 rename cargo/remote/{fluent-langneg-0.13.0.BUILD.bazel => BUILD.fluent-langneg-0.13.0.bazel} (95%)
 rename cargo/remote/{fluent-syntax-0.10.0.BUILD.bazel => BUILD.fluent-syntax-0.10.0.bazel} (95%)
 rename cargo/remote/{fnv-1.0.7.BUILD.bazel => BUILD.fnv-1.0.7.bazel} (95%)
 create mode 100644 cargo/remote/BUILD.form_urlencoded-1.0.0.bazel
 rename cargo/remote/{fuchsia-zircon-0.3.3.BUILD.bazel => BUILD.fuchsia-zircon-0.3.3.bazel} (95%)
 rename cargo/remote/{fuchsia-zircon-sys-0.3.3.BUILD.bazel => BUILD.fuchsia-zircon-sys-0.3.3.bazel} (95%)
 rename cargo/remote/{futures-0.3.7.BUILD.bazel => BUILD.futures-0.3.8.bazel} (87%)
 rename cargo/remote/{futures-channel-0.3.7.BUILD.bazel => BUILD.futures-channel-0.3.8.bazel} (87%)
 rename cargo/remote/{futures-core-0.3.7.BUILD.bazel => BUILD.futures-core-0.3.8.bazel} (93%)
 rename cargo/remote/{futures-executor-0.3.7.BUILD.bazel => BUILD.futures-executor-0.3.8.bazel} (82%)
 rename cargo/remote/{futures-io-0.3.7.BUILD.bazel => BUILD.futures-io-0.3.8.bazel} (92%)
 rename cargo/remote/{futures-macro-0.3.7.BUILD.bazel => BUILD.futures-macro-0.3.8.bazel} (94%)
 rename cargo/remote/{futures-sink-0.3.7.BUILD.bazel => BUILD.futures-sink-0.3.8.bazel} (93%)
 rename cargo/remote/{futures-task-0.3.7.BUILD.bazel => BUILD.futures-task-0.3.8.bazel} (93%)
 rename cargo/remote/{futures-util-0.3.7.BUILD.bazel => BUILD.futures-util-0.3.8.bazel} (80%)
 rename cargo/remote/{fxhash-0.2.1.BUILD.bazel => BUILD.fxhash-0.2.1.bazel} (95%)
 rename cargo/remote/{generic-array-0.14.4.BUILD.bazel => BUILD.generic-array-0.14.4.bazel} (94%)
 rename cargo/remote/{getrandom-0.1.15.BUILD.bazel => BUILD.getrandom-0.1.15.bazel} (95%)
 rename cargo/remote/{ghost-0.1.2.BUILD.bazel => BUILD.ghost-0.1.2.bazel} (95%)
 rename cargo/remote/{gimli-0.23.0.BUILD.bazel => BUILD.gimli-0.23.0.bazel} (96%)
 rename cargo/remote/{h2-0.2.7.BUILD.bazel => BUILD.h2-0.2.7.bazel} (87%)
 rename cargo/remote/{hashbrown-0.9.1.BUILD.bazel => BUILD.hashbrown-0.9.1.bazel} (96%)
 rename cargo/remote/{hashlink-0.6.0.BUILD.bazel => BUILD.hashlink-0.6.0.bazel} (95%)
 rename cargo/remote/{heck-0.3.1.BUILD.bazel => BUILD.heck-0.3.1.bazel} (95%)
 rename cargo/remote/{hermit-abi-0.1.17.BUILD.bazel => BUILD.hermit-abi-0.1.17.bazel} (95%)
 rename cargo/remote/{hex-0.4.2.BUILD.bazel => BUILD.hex-0.4.2.bazel} (95%)
 rename cargo/remote/{htmlescape-0.3.1.BUILD.bazel => BUILD.htmlescape-0.3.1.bazel} (95%)
 rename cargo/remote/{http-0.2.1.BUILD.bazel => BUILD.http-0.2.1.bazel} (96%)
 rename cargo/remote/{http-body-0.3.1.BUILD.bazel => BUILD.http-body-0.3.1.bazel} (95%)
 rename cargo/remote/{httparse-1.3.4.BUILD.bazel => BUILD.httparse-1.3.4.bazel} (92%)
 rename cargo/remote/{httpdate-0.3.2.BUILD.bazel => BUILD.httpdate-0.3.2.bazel} (95%)
 rename cargo/remote/{humansize-1.1.0.BUILD.bazel => BUILD.humansize-1.1.0.bazel} (95%)
 rename cargo/remote/{humantime-2.0.1.BUILD.bazel => BUILD.humantime-2.0.1.bazel} (95%)
 rename cargo/remote/{hyper-0.13.9.BUILD.bazel => BUILD.hyper-0.13.9.bazel} (93%)
 rename cargo/remote/{hyper-rustls-0.21.0.BUILD.bazel => BUILD.hyper-rustls-0.21.0.bazel} (93%)
 rename cargo/remote/{hyper-timeout-0.3.1.BUILD.bazel => BUILD.hyper-timeout-0.3.1.bazel} (95%)
 rename cargo/remote/{idna-0.2.0.BUILD.bazel => BUILD.idna-0.2.0.bazel} (95%)
 rename cargo/remote/{indexmap-1.6.0.BUILD.bazel => BUILD.indexmap-1.6.0.bazel} (94%)
 rename cargo/remote/{indoc-0.3.6.BUILD.bazel => BUILD.indoc-0.3.6.bazel} (95%)
 rename cargo/remote/{indoc-impl-0.3.6.BUILD.bazel => BUILD.indoc-impl-0.3.6.bazel} (96%)
 rename cargo/remote/{instant-0.1.8.BUILD.bazel => BUILD.instant-0.1.8.bazel} (95%)
 rename cargo/remote/{intl-memoizer-0.5.0.BUILD.bazel => BUILD.intl-memoizer-0.5.0.bazel} (95%)
 rename cargo/remote/{intl_pluralrules-7.0.0.BUILD.bazel => BUILD.intl_pluralrules-7.0.0.bazel} (95%)
 rename cargo/remote/{inventory-0.1.9.BUILD.bazel => BUILD.inventory-0.1.9.bazel} (94%)
 rename cargo/remote/{inventory-impl-0.1.9.BUILD.bazel => BUILD.inventory-impl-0.1.9.bazel} (95%)
 rename cargo/remote/{iovec-0.1.4.BUILD.bazel => BUILD.iovec-0.1.4.bazel} (96%)
 rename cargo/remote/{ipnet-2.3.0.BUILD.bazel => BUILD.ipnet-2.3.0.bazel} (95%)
 rename cargo/remote/{itertools-0.9.0.BUILD.bazel => BUILD.itertools-0.9.0.bazel} (96%)
 rename cargo/remote/{itoa-0.4.6.BUILD.bazel => BUILD.itoa-0.4.6.bazel} (95%)
 rename cargo/remote/{js-sys-0.3.45.BUILD.bazel => BUILD.js-sys-0.3.45.bazel} (95%)
 rename cargo/remote/{kernel32-sys-0.2.2.BUILD.bazel => BUILD.kernel32-sys-0.2.2.bazel} (94%)
 rename cargo/remote/{lazy_static-1.4.0.BUILD.bazel => BUILD.lazy_static-1.4.0.bazel} (95%)
 rename cargo/remote/{lexical-core-0.7.4.BUILD.bazel => BUILD.lexical-core-0.7.4.bazel} (89%)
 rename cargo/remote/{libc-0.2.80.BUILD.bazel => BUILD.libc-0.2.80.bazel} (92%)
 rename cargo/remote/{libsqlite3-sys-0.20.1.BUILD.bazel => BUILD.libsqlite3-sys-0.20.1.bazel} (87%)
 rename cargo/remote/{lock_api-0.4.1.BUILD.bazel => BUILD.lock_api-0.4.1.bazel} (95%)
 rename cargo/remote/{log-0.4.11.BUILD.bazel => BUILD.log-0.4.11.bazel} (93%)
 rename cargo/remote/{matches-0.1.8.BUILD.bazel => BUILD.matches-0.1.8.bazel} (95%)
 rename cargo/remote/{maybe-uninit-2.0.0.BUILD.bazel => BUILD.maybe-uninit-2.0.0.bazel} (93%)
 rename cargo/remote/{memchr-2.3.4.BUILD.bazel => BUILD.memchr-2.3.4.bazel} (91%)
 rename cargo/remote/{mime-0.3.16.BUILD.bazel => BUILD.mime-0.3.16.bazel} (95%)
 rename cargo/remote/{mime_guess-2.0.3.BUILD.bazel => BUILD.mime_guess-2.0.3.bazel} (92%)
 rename cargo/remote/{miniz_oxide-0.4.3.BUILD.bazel => BUILD.miniz_oxide-0.4.3.bazel} (93%)
 rename cargo/remote/{mio-0.6.22.BUILD.bazel => BUILD.mio-0.6.22.bazel} (97%)
 rename cargo/remote/{miow-0.2.1.BUILD.bazel => BUILD.miow-0.2.1.bazel} (95%)
 rename cargo/remote/{multimap-0.8.2.BUILD.bazel => BUILD.multimap-0.8.2.bazel} (95%)
 rename cargo/remote/{net2-0.2.35.BUILD.bazel => BUILD.net2-0.2.35.bazel} (97%)
 rename cargo/remote/{nodrop-0.1.14.BUILD.bazel => BUILD.nodrop-0.1.14.bazel} (95%)
 rename cargo/remote/{nom-5.1.2.BUILD.bazel => BUILD.nom-5.1.2.bazel} (94%)
 rename cargo/remote/{num-format-0.4.0.BUILD.bazel => BUILD.num-format-0.4.0.bazel} (97%)
 rename cargo/remote/{num-integer-0.1.44.BUILD.bazel => BUILD.num-integer-0.1.44.bazel} (93%)
 rename cargo/remote/{num-traits-0.2.14.BUILD.bazel => BUILD.num-traits-0.2.14.bazel} (92%)
 rename cargo/remote/{num_cpus-1.13.0.BUILD.bazel => BUILD.num_cpus-1.13.0.bazel} (95%)
 rename cargo/remote/{num_enum-0.5.1.BUILD.bazel => BUILD.num_enum-0.5.1.bazel} (96%)
 rename cargo/remote/{num_enum_derive-0.5.1.BUILD.bazel => BUILD.num_enum_derive-0.5.1.bazel} (96%)
 rename cargo/remote/{object-0.22.0.BUILD.bazel => BUILD.object-0.22.0.bazel} (96%)
 rename cargo/remote/{once_cell-1.4.1.BUILD.bazel => BUILD.once_cell-1.4.1.bazel} (96%)
 rename cargo/remote/{openssl-probe-0.1.2.BUILD.bazel => BUILD.openssl-probe-0.1.2.bazel} (95%)
 rename cargo/remote/{parking_lot-0.11.0.BUILD.bazel => BUILD.parking_lot-0.11.0.bazel} (95%)
 rename cargo/remote/{parking_lot_core-0.8.0.BUILD.bazel => BUILD.parking_lot_core-0.8.0.bazel} (97%)
 rename cargo/remote/{paste-0.1.18.BUILD.bazel => BUILD.paste-0.1.18.bazel} (95%)
 rename cargo/remote/{paste-impl-0.1.18.BUILD.bazel => BUILD.paste-impl-0.1.18.bazel} (95%)
 rename cargo/remote/{percent-encoding-2.1.0.BUILD.bazel => BUILD.percent-encoding-2.1.0.bazel} (95%)
 rename cargo/remote/{petgraph-0.5.1.BUILD.bazel => BUILD.petgraph-0.5.1.bazel} (96%)
 rename cargo/remote/{pin-project-0.4.27.BUILD.bazel => BUILD.pin-project-0.4.27.bazel} (97%)
 rename cargo/remote/{pin-project-1.0.1.BUILD.bazel => BUILD.pin-project-1.0.1.bazel} (97%)
 rename cargo/remote/{pin-project-internal-0.4.27.BUILD.bazel => BUILD.pin-project-internal-0.4.27.bazel} (94%)
 rename cargo/remote/{pin-project-internal-1.0.1.BUILD.bazel => BUILD.pin-project-internal-1.0.1.bazel} (95%)
 rename cargo/remote/{pin-project-lite-0.1.11.BUILD.bazel => BUILD.pin-project-lite-0.1.11.bazel} (95%)
 rename cargo/remote/{pin-utils-0.1.0.BUILD.bazel => BUILD.pin-utils-0.1.0.bazel} (95%)
 rename cargo/remote/{pkg-config-0.3.19.BUILD.bazel => BUILD.pkg-config-0.3.19.bazel} (95%)
 rename cargo/remote/{podio-0.1.7.BUILD.bazel => BUILD.podio-0.1.7.bazel} (95%)
 rename cargo/remote/{ppv-lite86-0.2.10.BUILD.bazel => BUILD.ppv-lite86-0.2.10.bazel} (95%)
 rename cargo/remote/{proc-macro-crate-0.1.5.BUILD.bazel => BUILD.proc-macro-crate-0.1.5.bazel} (95%)
 rename cargo/remote/{proc-macro-hack-0.5.19.BUILD.bazel => BUILD.proc-macro-hack-0.5.19.bazel} (93%)
 rename cargo/remote/{proc-macro-nested-0.1.6.BUILD.bazel => BUILD.proc-macro-nested-0.1.6.bazel} (93%)
 rename cargo/remote/{proc-macro2-1.0.24.BUILD.bazel => BUILD.proc-macro2-1.0.24.bazel} (93%)
 rename cargo/remote/{prost-0.6.1.BUILD.bazel => BUILD.prost-0.6.1.bazel} (95%)
 rename cargo/remote/{prost-build-0.6.1.BUILD.bazel => BUILD.prost-build-0.6.1.bazel} (94%)
 rename cargo/remote/{prost-derive-0.6.1.BUILD.bazel => BUILD.prost-derive-0.6.1.bazel} (96%)
 rename cargo/remote/{prost-types-0.6.1.BUILD.bazel => BUILD.prost-types-0.6.1.bazel} (95%)
 rename cargo/remote/{pyo3-0.12.3.BUILD.bazel => BUILD.pyo3-0.12.3.bazel} (93%)
 rename cargo/remote/{pyo3-derive-backend-0.12.3.BUILD.bazel => BUILD.pyo3-derive-backend-0.12.3.bazel} (95%)
 rename cargo/remote/{pyo3cls-0.12.3.BUILD.bazel => BUILD.pyo3cls-0.12.3.bazel} (95%)
 rename cargo/remote/{quote-1.0.7.BUILD.bazel => BUILD.quote-1.0.7.bazel} (95%)
 rename cargo/remote/{rand-0.7.3.BUILD.bazel => BUILD.rand-0.7.3.bazel} (97%)
 rename cargo/remote/{rand_chacha-0.2.2.BUILD.bazel => BUILD.rand_chacha-0.2.2.bazel} (95%)
 rename cargo/remote/{rand_core-0.5.1.BUILD.bazel => BUILD.rand_core-0.5.1.bazel} (95%)
 rename cargo/remote/{rand_hc-0.2.0.BUILD.bazel => BUILD.rand_hc-0.2.0.bazel} (95%)
 rename cargo/remote/{redox_syscall-0.1.57.BUILD.bazel => BUILD.redox_syscall-0.1.57.bazel} (95%)
 rename cargo/remote/{redox_users-0.3.5.BUILD.bazel => BUILD.redox_users-0.3.5.bazel} (95%)
 rename cargo/remote/{regex-1.4.2.BUILD.bazel => BUILD.regex-1.4.2.bazel} (95%)
 rename cargo/remote/{regex-syntax-0.6.21.BUILD.bazel => BUILD.regex-syntax-0.6.21.bazel} (96%)
 rename cargo/remote/{remove_dir_all-0.5.3.BUILD.bazel => BUILD.remove_dir_all-0.5.3.bazel} (96%)
 rename cargo/remote/{rental-0.5.5.BUILD.bazel => BUILD.rental-0.5.5.bazel} (96%)
 rename cargo/remote/{rental-impl-0.5.5.BUILD.bazel => BUILD.rental-impl-0.5.5.bazel} (95%)
 rename cargo/remote/{reqwest-0.10.8.BUILD.bazel => BUILD.reqwest-0.10.8.bazel} (95%)
 rename cargo/remote/{ring-0.16.15.BUILD.bazel => BUILD.ring-0.16.15.bazel} (97%)
 rename cargo/remote/{rusqlite-0.24.1.BUILD.bazel => BUILD.rusqlite-0.24.1.bazel} (96%)
 rename cargo/remote/{rust-argon2-0.8.2.BUILD.bazel => BUILD.rust-argon2-0.8.2.bazel} (96%)
 rename cargo/remote/{rustc-demangle-0.1.18.BUILD.bazel => BUILD.rustc-demangle-0.1.18.bazel} (95%)
 rename cargo/remote/{rustls-0.18.1.BUILD.bazel => BUILD.rustls-0.18.1.bazel} (96%)
 rename cargo/remote/{rustls-native-certs-0.4.0.BUILD.bazel => BUILD.rustls-native-certs-0.4.0.bazel} (97%)
 rename cargo/remote/{ryu-1.0.5.BUILD.bazel => BUILD.ryu-1.0.5.bazel} (95%)
 rename cargo/remote/{schannel-0.1.19.BUILD.bazel => BUILD.schannel-0.1.19.bazel} (95%)
 rename cargo/remote/{scopeguard-1.1.0.BUILD.bazel => BUILD.scopeguard-1.1.0.bazel} (95%)
 rename cargo/remote/{sct-0.6.0.BUILD.bazel => BUILD.sct-0.6.0.bazel} (95%)
 rename cargo/remote/{security-framework-1.0.0.BUILD.bazel => BUILD.security-framework-1.0.0.bazel} (96%)
 rename cargo/remote/{security-framework-sys-1.0.0.BUILD.bazel => BUILD.security-framework-sys-1.0.0.bazel} (95%)
 rename cargo/remote/{serde-1.0.117.BUILD.bazel => BUILD.serde-1.0.117.bazel} (90%)
 rename cargo/remote/{serde-aux-0.6.1.BUILD.bazel => BUILD.serde-aux-0.6.1.bazel} (96%)
 rename cargo/remote/{serde_derive-1.0.117.BUILD.bazel => BUILD.serde_derive-1.0.117.bazel} (93%)
 rename cargo/remote/{serde_json-1.0.59.BUILD.bazel => BUILD.serde_json-1.0.59.bazel} (92%)
 rename cargo/remote/{serde_repr-0.1.6.BUILD.bazel => BUILD.serde_repr-0.1.6.bazel} (95%)
 rename cargo/remote/{serde_tuple-0.5.0.BUILD.bazel => BUILD.serde_tuple-0.5.0.bazel} (95%)
 rename cargo/remote/{serde_tuple_macros-0.5.0.BUILD.bazel => BUILD.serde_tuple_macros-0.5.0.bazel} (95%)
 rename cargo/remote/{serde_urlencoded-0.6.1.BUILD.bazel => BUILD.serde_urlencoded-0.6.1.bazel} (93%)
 rename cargo/remote/{sha1-0.6.0.BUILD.bazel => BUILD.sha1-0.6.0.bazel} (95%)
 rename cargo/remote/{slab-0.4.2.BUILD.bazel => BUILD.slab-0.4.2.bazel} (95%)
 rename cargo/remote/{slog-2.5.2.BUILD.bazel => BUILD.slog-2.5.2.bazel} (90%)
 rename cargo/remote/{slog-async-2.5.0.BUILD.bazel => BUILD.slog-async-2.5.0.bazel} (95%)
 rename cargo/remote/{slog-envlogger-2.2.0.BUILD.bazel => BUILD.slog-envlogger-2.2.0.bazel} (96%)
 rename cargo/remote/{slog-scope-4.3.0.BUILD.bazel => BUILD.slog-scope-4.3.0.bazel} (95%)
 rename cargo/remote/{slog-stdlog-4.1.0.BUILD.bazel => BUILD.slog-stdlog-4.1.0.bazel} (95%)
 rename cargo/remote/{slog-term-2.6.0.BUILD.bazel => BUILD.slog-term-2.6.0.bazel} (96%)
 rename cargo/remote/{smallvec-1.4.2.BUILD.bazel => BUILD.smallvec-1.4.2.bazel} (95%)
 rename cargo/remote/{socket2-0.3.15.BUILD.bazel => BUILD.socket2-0.3.15.bazel} (97%)
 rename cargo/remote/{spin-0.5.2.BUILD.bazel => BUILD.spin-0.5.2.bazel} (95%)
 rename cargo/remote/{stable_deref_trait-1.2.0.BUILD.bazel => BUILD.stable_deref_trait-1.2.0.bazel} (95%)
 rename cargo/remote/{static_assertions-1.1.0.BUILD.bazel => BUILD.static_assertions-1.1.0.bazel} (95%)
 rename cargo/remote/{subtle-2.3.0.BUILD.bazel => BUILD.subtle-2.3.0.bazel} (95%)
 rename cargo/remote/{syn-1.0.48.BUILD.bazel => BUILD.syn-1.0.48.bazel} (91%)
 rename cargo/remote/{synstructure-0.12.4.BUILD.bazel => BUILD.synstructure-0.12.4.bazel} (95%)
 rename cargo/remote/{take_mut-0.2.2.BUILD.bazel => BUILD.take_mut-0.2.2.bazel} (95%)
 rename cargo/remote/{tempfile-3.1.0.BUILD.bazel => BUILD.tempfile-3.1.0.bazel} (97%)
 rename cargo/remote/{term-0.6.1.BUILD.bazel => BUILD.term-0.6.1.bazel} (96%)
 rename cargo/remote/{termcolor-1.1.0.BUILD.bazel => BUILD.termcolor-1.1.0.bazel} (96%)
 rename cargo/remote/{thiserror-1.0.21.BUILD.bazel => BUILD.thiserror-1.0.22.bazel} (92%)
 rename cargo/remote/{thiserror-impl-1.0.21.BUILD.bazel => BUILD.thiserror-impl-1.0.22.bazel} (93%)
 rename cargo/remote/{thread_local-1.0.1.BUILD.bazel => BUILD.thread_local-1.0.1.bazel} (95%)
 rename cargo/remote/{time-0.1.44.BUILD.bazel => BUILD.time-0.1.44.bazel} (96%)
 rename cargo/remote/{tinystr-0.3.4.BUILD.bazel => BUILD.tinystr-0.3.4.bazel} (95%)
 rename cargo/remote/{tinyvec-0.3.4.BUILD.bazel => BUILD.tinyvec-0.3.4.bazel} (95%)
 rename cargo/remote/{tokio-0.2.22.BUILD.bazel => BUILD.tokio-0.2.22.bazel} (97%)
 rename cargo/remote/{tokio-io-timeout-0.4.0.BUILD.bazel => BUILD.tokio-io-timeout-0.4.0.bazel} (95%)
 rename cargo/remote/{tokio-rustls-0.14.1.BUILD.bazel => BUILD.tokio-rustls-0.14.1.bazel} (92%)
 rename cargo/remote/{tokio-socks-0.3.0.BUILD.bazel => BUILD.tokio-socks-0.3.0.bazel} (90%)
 rename cargo/remote/{tokio-util-0.3.1.BUILD.bazel => BUILD.tokio-util-0.3.1.bazel} (90%)
 rename cargo/remote/{toml-0.5.7.BUILD.bazel => BUILD.toml-0.5.7.bazel} (95%)
 rename cargo/remote/{tower-service-0.3.0.BUILD.bazel => BUILD.tower-service-0.3.0.bazel} (95%)
 rename cargo/remote/{tracing-0.1.21.BUILD.bazel => BUILD.tracing-0.1.21.bazel} (97%)
 rename cargo/remote/{tracing-core-0.1.17.BUILD.bazel => BUILD.tracing-core-0.1.17.bazel} (95%)
 rename cargo/remote/{tracing-futures-0.2.4.BUILD.bazel => BUILD.tracing-futures-0.2.4.bazel} (95%)
 rename cargo/remote/{try-lock-0.2.3.BUILD.bazel => BUILD.try-lock-0.2.3.bazel} (95%)
 rename cargo/remote/{type-map-0.3.0.BUILD.bazel => BUILD.type-map-0.3.0.bazel} (95%)
 rename cargo/remote/{typenum-1.12.0.BUILD.bazel => BUILD.typenum-1.12.0.bazel} (93%)
 rename cargo/remote/{unic-langid-0.9.0.BUILD.bazel => BUILD.unic-langid-0.9.0.bazel} (95%)
 rename cargo/remote/{unic-langid-impl-0.9.0.BUILD.bazel => BUILD.unic-langid-impl-0.9.0.bazel} (95%)
 rename cargo/remote/{unic-langid-macros-0.9.0.BUILD.bazel => BUILD.unic-langid-macros-0.9.0.bazel} (96%)
 rename cargo/remote/{unic-langid-macros-impl-0.9.0.BUILD.bazel => BUILD.unic-langid-macros-impl-0.9.0.bazel} (96%)
 rename cargo/remote/{unicase-2.6.0.BUILD.bazel => BUILD.unicase-2.6.0.bazel} (93%)
 rename cargo/remote/{unicode-bidi-0.3.4.BUILD.bazel => BUILD.unicode-bidi-0.3.4.bazel} (95%)
 rename cargo/remote/{unicode-normalization-0.1.13.BUILD.bazel => BUILD.unicode-normalization-0.1.13.bazel} (95%)
 rename cargo/remote/{unicode-segmentation-1.6.0.BUILD.bazel => BUILD.unicode-segmentation-1.6.0.bazel} (95%)
 rename cargo/remote/{unicode-xid-0.2.1.BUILD.bazel => BUILD.unicode-xid-0.2.1.bazel} (95%)
 rename cargo/remote/{unindent-0.1.7.BUILD.bazel => BUILD.unindent-0.1.7.bazel} (95%)
 rename cargo/remote/{untrusted-0.7.1.BUILD.bazel => BUILD.untrusted-0.7.1.bazel} (95%)
 rename cargo/remote/{url-2.1.1.BUILD.bazel => BUILD.url-2.2.0.bazel} (84%)
 rename cargo/remote/{utime-0.3.1.BUILD.bazel => BUILD.utime-0.3.1.bazel} (97%)
 rename cargo/remote/{vcpkg-0.2.10.BUILD.bazel => BUILD.vcpkg-0.2.10.bazel} (95%)
 rename cargo/remote/{version_check-0.9.2.BUILD.bazel => BUILD.version_check-0.9.2.bazel} (95%)
 rename cargo/remote/{want-0.3.0.BUILD.bazel => BUILD.want-0.3.0.bazel} (95%)
 rename cargo/remote/{wasi-0.10.0+wasi-snapshot-preview1.BUILD.bazel => BUILD.wasi-0.10.0+wasi-snapshot-preview1.bazel} (95%)
 rename cargo/remote/{wasi-0.9.0+wasi-snapshot-preview1.BUILD.bazel => BUILD.wasi-0.9.0+wasi-snapshot-preview1.bazel} (95%)
 rename cargo/remote/{wasm-bindgen-0.2.68.BUILD.bazel => BUILD.wasm-bindgen-0.2.68.bazel} (91%)
 rename cargo/remote/{wasm-bindgen-backend-0.2.68.BUILD.bazel => BUILD.wasm-bindgen-backend-0.2.68.bazel} (96%)
 rename cargo/remote/{wasm-bindgen-futures-0.4.18.BUILD.bazel => BUILD.wasm-bindgen-futures-0.4.18.bazel} (95%)
 rename cargo/remote/{wasm-bindgen-macro-0.2.68.BUILD.bazel => BUILD.wasm-bindgen-macro-0.2.68.bazel} (95%)
 rename cargo/remote/{wasm-bindgen-macro-support-0.2.68.BUILD.bazel => BUILD.wasm-bindgen-macro-support-0.2.68.bazel} (96%)
 rename cargo/remote/{wasm-bindgen-shared-0.2.68.BUILD.bazel => BUILD.wasm-bindgen-shared-0.2.68.bazel} (93%)
 rename cargo/remote/{web-sys-0.3.45.BUILD.bazel => BUILD.web-sys-0.3.45.bazel} (96%)
 rename cargo/remote/{webpki-0.21.3.BUILD.bazel => BUILD.webpki-0.21.3.bazel} (95%)
 rename cargo/remote/{which-4.0.2.BUILD.bazel => BUILD.which-4.0.2.bazel} (91%)
 rename cargo/remote/{winapi-0.2.8.BUILD.bazel => BUILD.winapi-0.2.8.bazel} (94%)
 rename cargo/remote/{winapi-0.3.9.BUILD.bazel => BUILD.winapi-0.3.9.bazel} (73%)
 rename cargo/remote/{winapi-build-0.1.1.BUILD.bazel => BUILD.winapi-build-0.1.1.bazel} (95%)
 rename cargo/remote/{winapi-i686-pc-windows-gnu-0.4.0.BUILD.bazel => BUILD.winapi-i686-pc-windows-gnu-0.4.0.bazel} (93%)
 rename cargo/remote/{winapi-util-0.1.5.BUILD.bazel => BUILD.winapi-util-0.1.5.bazel} (96%)
 rename cargo/remote/{winapi-x86_64-pc-windows-gnu-0.4.0.BUILD.bazel => BUILD.winapi-x86_64-pc-windows-gnu-0.4.0.bazel} (93%)
 rename cargo/remote/{winreg-0.7.0.BUILD.bazel => BUILD.winreg-0.7.0.bazel} (95%)
 rename cargo/remote/{ws2_32-sys-0.2.1.BUILD.bazel => BUILD.ws2_32-sys-0.2.1.bazel} (94%)
 rename cargo/remote/{zip-0.5.6.BUILD.bazel => BUILD.zip-0.5.6.bazel} (96%)
 delete mode 100644 cargo/remote/coarsetime-0.1.14.BUILD.bazel

diff --git a/cargo/BUILD.bazel b/cargo/BUILD.bazel
index 1fa5ae8f9..5adc85c20 100644
--- a/cargo/BUILD.bazel
+++ b/cargo/BUILD.bazel
@@ -1,6 +1,6 @@
 """
 @generated
-cargo-raze workspace build file.
+cargo-raze generated Bazel file.
 
 DO NOT EDIT! Replaced on runs of cargo-raze
 """
@@ -23,7 +23,7 @@ alias(
 
 alias(
     name = "async_compression",
-    actual = "@raze__async_compression__0_3_5//:async_compression",
+    actual = "@raze__async_compression__0_3_6//:async_compression",
     tags = [
         "cargo-raze",
         "manual",
@@ -113,7 +113,7 @@ alias(
 
 alias(
     name = "futures",
-    actual = "@raze__futures__0_3_7//:futures",
+    actual = "@raze__futures__0_3_8//:futures",
     tags = [
         "cargo-raze",
         "manual",
diff --git a/cargo/Cargo.lock b/cargo/Cargo.lock
index 0eb4c9af2..f05656fe2 100644
--- a/cargo/Cargo.lock
+++ b/cargo/Cargo.lock
@@ -23,9 +23,9 @@ checksum = "f6789e291be47ace86a60303502173d84af8327e3627ecf334356ee0f87a164c"
 
 [[package]]
 name = "aho-corasick"
-version = "0.7.14"
+version = "0.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b476ce7103678b0c6d3d395dbbae31d48ff910bd28be979ba5d48c6351131d0d"
+checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
 dependencies = [
  "memchr",
 ]
@@ -112,9 +112,9 @@ dependencies = [
 
 [[package]]
 name = "async-compression"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9021768bcce77296b64648cc7a7460e3df99979b97ed5c925c38d1cc83778d98"
+checksum = "fb1ff21a63d3262af46b9f33a826a8d134e2d0d9b2179c86034948b732ea8b2a"
 dependencies = [
  "bytes 0.5.6",
  "flate2",
@@ -228,9 +228,9 @@ checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
 
 [[package]]
 name = "cc"
-version = "1.0.61"
+version = "1.0.62"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed67cbde08356238e75fc4656be4749481eeffb09e19f320a25237d5221c985d"
+checksum = "f1770ced377336a88a67c473594ccc14eca6f4559217c34f64aac8f83d641b40"
 
 [[package]]
 name = "cfg-if"
@@ -576,6 +576,16 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "form_urlencoded"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ece68d15c92e84fa4f19d3780f1294e5ca82a78a6d515f1efaabcc144688be00"
+dependencies = [
+ "matches",
+ "percent-encoding",
+]
+
 [[package]]
 name = "fuchsia-zircon"
 version = "0.3.3"
@@ -594,9 +604,9 @@ checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
 
 [[package]]
 name = "futures"
-version = "0.3.7"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95314d38584ffbfda215621d723e0a3906f032e03ae5551e650058dac83d4797"
+checksum = "9b3b0c040a1fe6529d30b3c5944b280c7f0dcb2930d2c3062bca967b602583d0"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -609,9 +619,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.7"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0448174b01148032eed37ac4aed28963aaaa8cfa93569a08e5b479bbc6c2c151"
+checksum = "4b7109687aa4e177ef6fe84553af6280ef2778bdb7783ba44c9dc3399110fe64"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -619,15 +629,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.7"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18eaa56102984bed2c88ea39026cff3ce3b4c7f508ca970cedf2450ea10d4e46"
+checksum = "847ce131b72ffb13b6109a221da9ad97a64cbe48feb1028356b836b47b8f1748"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.7"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5f8e0c9258abaea85e78ebdda17ef9666d390e987f006be6080dfe354b708cb"
+checksum = "4caa2b2b68b880003057c1dd49f1ed937e38f22fcf6c212188a121f08cf40a65"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -636,15 +646,15 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.7"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e1798854a4727ff944a7b12aa999f58ce7aa81db80d2dfaaf2ba06f065ddd2b"
+checksum = "611834ce18aaa1bd13c4b374f5d653e1027cf99b6b502584ff8c9a64413b30bb"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.7"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e36fccf3fc58563b4a14d265027c627c3b665d7fed489427e88e7cc929559efe"
+checksum = "77408a692f1f97bcc61dc001d752e00643408fbc922e4d634c655df50d595556"
 dependencies = [
  "proc-macro-hack",
  "proc-macro2",
@@ -654,24 +664,24 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.7"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e3ca3f17d6e8804ae5d3df7a7d35b2b3a6fe89dac84b31872720fc3060a0b11"
+checksum = "f878195a49cee50e006b02b93cf7e0a95a38ac7b776b4c4d9cc1207cd20fcb3d"
 
 [[package]]
 name = "futures-task"
-version = "0.3.7"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d502af37186c4fef99453df03e374683f8a1eec9dcc1e66b3b82dc8278ce3c"
+checksum = "7c554eb5bf48b2426c4771ab68c6b14468b6e76cc90996f528c3338d761a4d0d"
 dependencies = [
  "once_cell",
 ]
 
 [[package]]
 name = "futures-util"
-version = "0.3.7"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abcb44342f62e6f3e8ac427b8aa815f724fd705dfad060b18ac7866c15bb8e34"
+checksum = "d304cff4a7b99cfb7986f7d43fbe93d175e72e704a8860787cc95e9ffd85cbd2"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2081,18 +2091,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.21"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "318234ffa22e0920fe9a40d7b8369b5f649d490980cf7aadcf1eb91594869b42"
+checksum = "0e9ae34b84616eedaaf1e9dd6026dbe00dcafa92aa0c8077cb69df1fcfe5e53e"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.21"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cae2447b6282786c3493999f40a9be2a6ad20cb8bd268b0a0dbf5a065535c0ab"
+checksum = "9ba20f23e85b10754cd195504aebf6a27e2e6cbe28c17778a0c930724628dd56"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2360,10 +2370,11 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
 
 [[package]]
 name = "url"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb"
+checksum = "5909f2b0817350449ed73e8bcd81c8c3c8d9a7a5d8acba4b27db277f1868976e"
 dependencies = [
+ "form_urlencoded",
  "idna",
  "matches",
  "percent-encoding",
diff --git a/cargo/README.md b/cargo/README.md
index 544536b4e..65ced3472 100644
--- a/cargo/README.md
+++ b/cargo/README.md
@@ -4,7 +4,7 @@ After updating dependencies in ../rslib/Cargo.toml, change to this
 folder and run python update.py to update the external Bazel repositories
 to point to the updated deps.
 
-You will need to have cargo-raze 0.6.1 or later installed, which is not
+You will need to have cargo-raze 0.7.0 or later installed, which is not
 currently included in this Bazel project. You can install it by installing
 rustup, then running "cargo install cargo-raze".
 
@@ -12,14 +12,13 @@ A couple of crates need extra work to build with Bazel, and are listed
 in raze.toml. For example:
 
 ```toml
-[raze.crates.ring.'0.16.15']
+[raze.crates.ring.'*']
 data_attr = "glob([\"src/**\"])"
 ```
 
-After updating dependencies, if one of these crates has changed to a
-new version, the version in raze.toml will need to be updated, and
-update.py re-run.
+With minor version updates, you should not normally need to modify
+the entries in that file.
 
 The ../pylib/rsbridge folder has a dependency on pyo3, which is
-special-cases in update.py. If updating the pyo3 version, raze.toml
-and update.py need to be updated as well.
+special-cased in update.py. If updating the pyo3 version, update.py
+needs to be updated as well.
diff --git a/cargo/crates.bzl b/cargo/crates.bzl
index 94590cb9b..2b55dd506 100644
--- a/cargo/crates.bzl
+++ b/cargo/crates.bzl
@@ -1,6 +1,6 @@
 """
 @generated
-cargo-raze crate workspace functions
+cargo-raze generated Bazel file.
 
 DO NOT EDIT! Replaced on runs of cargo-raze
 """
@@ -18,7 +18,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "7c0929d69e78dd9bf5408269919fcbcaeb2e35e5d43e5815517cdc6a8e11a423",
         strip_prefix = "addr2line-0.14.0",
-        build_file = Label("//cargo/remote:addr2line-0.14.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.addr2line-0.14.0.bazel"),
     )
 
     maybe(
@@ -28,7 +28,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e",
         strip_prefix = "adler-0.2.3",
-        build_file = Label("//cargo/remote:adler-0.2.3.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.adler-0.2.3.bazel"),
     )
 
     maybe(
@@ -38,17 +38,17 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "f6789e291be47ace86a60303502173d84af8327e3627ecf334356ee0f87a164c",
         strip_prefix = "ahash-0.4.6",
-        build_file = Label("//cargo/remote:ahash-0.4.6.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.ahash-0.4.6.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "raze__aho_corasick__0_7_14",
-        url = "https://crates.io/api/v1/crates/aho-corasick/0.7.14/download",
+        name = "raze__aho_corasick__0_7_15",
+        url = "https://crates.io/api/v1/crates/aho-corasick/0.7.15/download",
         type = "tar.gz",
-        sha256 = "b476ce7103678b0c6d3d395dbbae31d48ff910bd28be979ba5d48c6351131d0d",
-        strip_prefix = "aho-corasick-0.7.14",
-        build_file = Label("//cargo/remote:aho-corasick-0.7.14.BUILD.bazel"),
+        sha256 = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5",
+        strip_prefix = "aho-corasick-0.7.15",
+        build_file = Label("//cargo/remote:BUILD.aho-corasick-0.7.15.bazel"),
     )
 
     maybe(
@@ -58,7 +58,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "bf8dcb5b4bbaa28653b647d8c77bd4ed40183b48882e130c1f1ffb73de069fd7",
         strip_prefix = "anyhow-1.0.34",
-        build_file = Label("//cargo/remote:anyhow-1.0.34.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.anyhow-1.0.34.bazel"),
     )
 
     maybe(
@@ -68,7 +68,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "4d25d88fd6b8041580a654f9d0c581a047baee2b3efee13275f2fc392fc75034",
         strip_prefix = "arc-swap-0.4.7",
-        build_file = Label("//cargo/remote:arc-swap-0.4.7.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.arc-swap-0.4.7.bazel"),
     )
 
     maybe(
@@ -78,7 +78,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544",
         strip_prefix = "arrayref-0.3.6",
-        build_file = Label("//cargo/remote:arrayref-0.3.6.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.arrayref-0.3.6.bazel"),
     )
 
     maybe(
@@ -88,7 +88,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9",
         strip_prefix = "arrayvec-0.4.12",
-        build_file = Label("//cargo/remote:arrayvec-0.4.12.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.arrayvec-0.4.12.bazel"),
     )
 
     maybe(
@@ -98,7 +98,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b",
         strip_prefix = "arrayvec-0.5.2",
-        build_file = Label("//cargo/remote:arrayvec-0.5.2.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.arrayvec-0.5.2.bazel"),
     )
 
     maybe(
@@ -108,7 +108,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "70a6e7ebd44d0047fd48206c83c5cd3214acc7b9d87f001da170145c47ef7d12",
         strip_prefix = "askama-0.10.3",
-        build_file = Label("//cargo/remote:askama-0.10.3.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.askama-0.10.3.bazel"),
     )
 
     maybe(
@@ -118,7 +118,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "e1d7169690c4f56343dcd821ab834972a22570a2662a19a84fd7775d5e1c3881",
         strip_prefix = "askama_derive-0.10.3",
-        build_file = Label("//cargo/remote:askama_derive-0.10.3.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.askama_derive-0.10.3.bazel"),
     )
 
     maybe(
@@ -128,7 +128,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "90c108c1a94380c89d2215d0ac54ce09796823cca0fd91b299cfff3b33e346fb",
         strip_prefix = "askama_escape-0.10.1",
-        build_file = Label("//cargo/remote:askama_escape-0.10.1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.askama_escape-0.10.1.bazel"),
     )
 
     maybe(
@@ -138,17 +138,17 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "62fc272363345c8cdc030e4c259d9d028237f8b057dc9bb327772a257bde6bb5",
         strip_prefix = "askama_shared-0.10.4",
-        build_file = Label("//cargo/remote:askama_shared-0.10.4.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.askama_shared-0.10.4.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "raze__async_compression__0_3_5",
-        url = "https://crates.io/api/v1/crates/async-compression/0.3.5/download",
+        name = "raze__async_compression__0_3_6",
+        url = "https://crates.io/api/v1/crates/async-compression/0.3.6/download",
         type = "tar.gz",
-        sha256 = "9021768bcce77296b64648cc7a7460e3df99979b97ed5c925c38d1cc83778d98",
-        strip_prefix = "async-compression-0.3.5",
-        build_file = Label("//cargo/remote:async-compression-0.3.5.BUILD.bazel"),
+        sha256 = "fb1ff21a63d3262af46b9f33a826a8d134e2d0d9b2179c86034948b732ea8b2a",
+        strip_prefix = "async-compression-0.3.6",
+        build_file = Label("//cargo/remote:BUILD.async-compression-0.3.6.bazel"),
     )
 
     maybe(
@@ -158,7 +158,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8",
         strip_prefix = "atty-0.2.14",
-        build_file = Label("//cargo/remote:atty-0.2.14.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.atty-0.2.14.bazel"),
     )
 
     maybe(
@@ -168,7 +168,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a",
         strip_prefix = "autocfg-1.0.1",
-        build_file = Label("//cargo/remote:autocfg-1.0.1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.autocfg-1.0.1.bazel"),
     )
 
     maybe(
@@ -178,7 +178,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "2baad346b2d4e94a24347adeee9c7a93f412ee94b9cc26e5b59dea23848e9f28",
         strip_prefix = "backtrace-0.3.54",
-        build_file = Label("//cargo/remote:backtrace-0.3.54.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.backtrace-0.3.54.bazel"),
     )
 
     maybe(
@@ -188,7 +188,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff",
         strip_prefix = "base64-0.12.3",
-        build_file = Label("//cargo/remote:base64-0.12.3.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.base64-0.12.3.bazel"),
     )
 
     maybe(
@@ -198,7 +198,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd",
         strip_prefix = "base64-0.13.0",
-        build_file = Label("//cargo/remote:base64-0.13.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.base64-0.13.0.bazel"),
     )
 
     maybe(
@@ -208,7 +208,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693",
         strip_prefix = "bitflags-1.2.1",
-        build_file = Label("//cargo/remote:bitflags-1.2.1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.bitflags-1.2.1.bazel"),
     )
 
     maybe(
@@ -218,7 +218,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587",
         strip_prefix = "blake2b_simd-0.5.11",
-        build_file = Label("//cargo/remote:blake2b_simd-0.5.11.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.blake2b_simd-0.5.11.bazel"),
     )
 
     maybe(
@@ -228,7 +228,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "e9ff35b701f3914bdb8fad3368d822c766ef2858b2583198e41639b936f09d3f",
         strip_prefix = "blake3-0.3.7",
-        build_file = Label("//cargo/remote:blake3-0.3.7.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.blake3-0.3.7.bazel"),
     )
 
     maybe(
@@ -238,7 +238,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820",
         strip_prefix = "bumpalo-3.4.0",
-        build_file = Label("//cargo/remote:bumpalo-3.4.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.bumpalo-3.4.0.bazel"),
     )
 
     maybe(
@@ -248,7 +248,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de",
         strip_prefix = "byteorder-1.3.4",
-        build_file = Label("//cargo/remote:byteorder-1.3.4.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.byteorder-1.3.4.bazel"),
     )
 
     maybe(
@@ -258,7 +258,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c",
         strip_prefix = "bytes-0.4.12",
-        build_file = Label("//cargo/remote:bytes-0.4.12.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.bytes-0.4.12.bazel"),
     )
 
     maybe(
@@ -268,17 +268,17 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38",
         strip_prefix = "bytes-0.5.6",
-        build_file = Label("//cargo/remote:bytes-0.5.6.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.bytes-0.5.6.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "raze__cc__1_0_61",
-        url = "https://crates.io/api/v1/crates/cc/1.0.61/download",
+        name = "raze__cc__1_0_62",
+        url = "https://crates.io/api/v1/crates/cc/1.0.62/download",
         type = "tar.gz",
-        sha256 = "ed67cbde08356238e75fc4656be4749481eeffb09e19f320a25237d5221c985d",
-        strip_prefix = "cc-1.0.61",
-        build_file = Label("//cargo/remote:cc-1.0.61.BUILD.bazel"),
+        sha256 = "f1770ced377336a88a67c473594ccc14eca6f4559217c34f64aac8f83d641b40",
+        strip_prefix = "cc-1.0.62",
+        build_file = Label("//cargo/remote:BUILD.cc-1.0.62.bazel"),
     )
 
     maybe(
@@ -288,7 +288,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822",
         strip_prefix = "cfg-if-0.1.10",
-        build_file = Label("//cargo/remote:cfg-if-0.1.10.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.cfg-if-0.1.10.bazel"),
     )
 
     maybe(
@@ -298,7 +298,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd",
         strip_prefix = "cfg-if-1.0.0",
-        build_file = Label("//cargo/remote:cfg-if-1.0.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.cfg-if-1.0.0.bazel"),
     )
 
     maybe(
@@ -308,7 +308,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73",
         strip_prefix = "chrono-0.4.19",
-        build_file = Label("//cargo/remote:chrono-0.4.19.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.chrono-0.4.19.bazel"),
     )
 
     maybe(
@@ -318,7 +318,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "4344512281c643ae7638bbabc3af17a11307803ec8f0fcad9fae512a8bf36467",
         strip_prefix = "cloudabi-0.1.0",
-        build_file = Label("//cargo/remote:cloudabi-0.1.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.cloudabi-0.1.0.bazel"),
     )
 
     maybe(
@@ -327,7 +327,7 @@ def raze_fetch_remote_crates():
         remote = "https://github.com/ankitects/rust-coarsetime.git",
         shallow_since = "1594611111 +1000",
         commit = "f9e2c86216f0f4803bc75404828318fc206dab29",
-        build_file = Label("//cargo/remote:coarsetime-0.1.14.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.coarsetime-0.1.14.bazel"),
         init_submodules = True,
     )
 
@@ -338,7 +338,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc",
         strip_prefix = "constant_time_eq-0.1.5",
-        build_file = Label("//cargo/remote:constant_time_eq-0.1.5.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.constant_time_eq-0.1.5.bazel"),
     )
 
     maybe(
@@ -348,7 +348,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171",
         strip_prefix = "core-foundation-0.7.0",
-        build_file = Label("//cargo/remote:core-foundation-0.7.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.core-foundation-0.7.0.bazel"),
     )
 
     maybe(
@@ -358,7 +358,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac",
         strip_prefix = "core-foundation-sys-0.7.0",
-        build_file = Label("//cargo/remote:core-foundation-sys-0.7.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.core-foundation-sys-0.7.0.bazel"),
     )
 
     maybe(
@@ -368,7 +368,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a",
         strip_prefix = "crc32fast-1.2.1",
-        build_file = Label("//cargo/remote:crc32fast-1.2.1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.crc32fast-1.2.1.bazel"),
     )
 
     maybe(
@@ -378,7 +378,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87",
         strip_prefix = "crossbeam-channel-0.4.4",
-        build_file = Label("//cargo/remote:crossbeam-channel-0.4.4.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.crossbeam-channel-0.4.4.bazel"),
     )
 
     maybe(
@@ -388,7 +388,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8",
         strip_prefix = "crossbeam-utils-0.7.2",
-        build_file = Label("//cargo/remote:crossbeam-utils-0.7.2.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.crossbeam-utils-0.7.2.bazel"),
     )
 
     maybe(
@@ -398,7 +398,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab",
         strip_prefix = "crypto-mac-0.8.0",
-        build_file = Label("//cargo/remote:crypto-mac-0.8.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.crypto-mac-0.8.0.bazel"),
     )
 
     maybe(
@@ -408,7 +408,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "7fbaabec2c953050352311293be5c6aba8e141ba19d6811862b232d6fd020484",
         strip_prefix = "ctor-0.1.16",
-        build_file = Label("//cargo/remote:ctor-0.1.16.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.ctor-0.1.16.bazel"),
     )
 
     maybe(
@@ -418,7 +418,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "cb582b60359da160a9477ee80f15c8d784c477e69c217ef2cdd4169c24ea380f",
         strip_prefix = "derivative-2.1.1",
-        build_file = Label("//cargo/remote:derivative-2.1.1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.derivative-2.1.1.bazel"),
     )
 
     maybe(
@@ -428,7 +428,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066",
         strip_prefix = "digest-0.9.0",
-        build_file = Label("//cargo/remote:digest-0.9.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.digest-0.9.0.bazel"),
     )
 
     maybe(
@@ -438,7 +438,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3",
         strip_prefix = "dirs-2.0.2",
-        build_file = Label("//cargo/remote:dirs-2.0.2.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.dirs-2.0.2.bazel"),
     )
 
     maybe(
@@ -448,7 +448,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a",
         strip_prefix = "dirs-sys-0.3.5",
-        build_file = Label("//cargo/remote:dirs-sys-0.3.5.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.dirs-sys-0.3.5.bazel"),
     )
 
     maybe(
@@ -458,7 +458,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "134951f4028bdadb9b84baf4232681efbf277da25144b9b0ad65df75946c422b",
         strip_prefix = "dtoa-0.4.6",
-        build_file = Label("//cargo/remote:dtoa-0.4.6.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.dtoa-0.4.6.bazel"),
     )
 
     maybe(
@@ -468,7 +468,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457",
         strip_prefix = "either-1.6.1",
-        build_file = Label("//cargo/remote:either-1.6.1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.either-1.6.1.bazel"),
     )
 
     maybe(
@@ -478,7 +478,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "801bbab217d7f79c0062f4f7205b5d4427c6d1a7bd7aafdd1475f7c59d62b283",
         strip_prefix = "encoding_rs-0.8.26",
-        build_file = Label("//cargo/remote:encoding_rs-0.8.26.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.encoding_rs-0.8.26.bazel"),
     )
 
     maybe(
@@ -488,7 +488,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "54532e3223c5af90a6a757c90b5c5521564b07e5e7a958681bcd2afad421cdcd",
         strip_prefix = "env_logger-0.8.1",
-        build_file = Label("//cargo/remote:env_logger-0.8.1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.env_logger-0.8.1.bazel"),
     )
 
     maybe(
@@ -498,7 +498,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86",
         strip_prefix = "failure-0.1.8",
-        build_file = Label("//cargo/remote:failure-0.1.8.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.failure-0.1.8.bazel"),
     )
 
     maybe(
@@ -508,7 +508,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4",
         strip_prefix = "failure_derive-0.1.8",
-        build_file = Label("//cargo/remote:failure_derive-0.1.8.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.failure_derive-0.1.8.bazel"),
     )
 
     maybe(
@@ -518,7 +518,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7",
         strip_prefix = "fallible-iterator-0.2.0",
-        build_file = Label("//cargo/remote:fallible-iterator-0.2.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.fallible-iterator-0.2.0.bazel"),
     )
 
     maybe(
@@ -528,7 +528,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a",
         strip_prefix = "fallible-streaming-iterator-0.1.9",
-        build_file = Label("//cargo/remote:fallible-streaming-iterator-0.1.9.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.fallible-streaming-iterator-0.1.9.bazel"),
     )
 
     maybe(
@@ -538,7 +538,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d",
         strip_prefix = "fixedbitset-0.2.0",
-        build_file = Label("//cargo/remote:fixedbitset-0.2.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.fixedbitset-0.2.0.bazel"),
     )
 
     maybe(
@@ -548,7 +548,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "7411863d55df97a419aa64cb4d2f167103ea9d767e2c54a1868b7ac3f6b47129",
         strip_prefix = "flate2-1.0.19",
-        build_file = Label("//cargo/remote:flate2-1.0.19.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.flate2-1.0.19.bazel"),
     )
 
     maybe(
@@ -558,7 +558,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "ef9e54ec7b674ae3477d948ae790e90ae24d54fb31c2e7173252978d9b09bdfa",
         strip_prefix = "fluent-0.13.1",
-        build_file = Label("//cargo/remote:fluent-0.13.1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.fluent-0.13.1.bazel"),
     )
 
     maybe(
@@ -568,7 +568,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "a79916560098f0a57215a489e37b7fc83088949eab7f7977dcc329b254d50c17",
         strip_prefix = "fluent-bundle-0.13.1",
-        build_file = Label("//cargo/remote:fluent-bundle-0.13.1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.fluent-bundle-0.13.1.bazel"),
     )
 
     maybe(
@@ -578,7 +578,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "2c4ad0989667548f06ccd0e306ed56b61bd4d35458d54df5ec7587c0e8ed5e94",
         strip_prefix = "fluent-langneg-0.13.0",
-        build_file = Label("//cargo/remote:fluent-langneg-0.13.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.fluent-langneg-0.13.0.bazel"),
     )
 
     maybe(
@@ -588,7 +588,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "9389354f858e38f37d9a249133611a1fcaec469f44773b04ddbd82f4f08d49eb",
         strip_prefix = "fluent-syntax-0.10.0",
-        build_file = Label("//cargo/remote:fluent-syntax-0.10.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.fluent-syntax-0.10.0.bazel"),
     )
 
     maybe(
@@ -598,7 +598,17 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1",
         strip_prefix = "fnv-1.0.7",
-        build_file = Label("//cargo/remote:fnv-1.0.7.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.fnv-1.0.7.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "raze__form_urlencoded__1_0_0",
+        url = "https://crates.io/api/v1/crates/form_urlencoded/1.0.0/download",
+        type = "tar.gz",
+        sha256 = "ece68d15c92e84fa4f19d3780f1294e5ca82a78a6d515f1efaabcc144688be00",
+        strip_prefix = "form_urlencoded-1.0.0",
+        build_file = Label("//cargo/remote:BUILD.form_urlencoded-1.0.0.bazel"),
     )
 
     maybe(
@@ -608,7 +618,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82",
         strip_prefix = "fuchsia-zircon-0.3.3",
-        build_file = Label("//cargo/remote:fuchsia-zircon-0.3.3.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.fuchsia-zircon-0.3.3.bazel"),
     )
 
     maybe(
@@ -618,97 +628,97 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7",
         strip_prefix = "fuchsia-zircon-sys-0.3.3",
-        build_file = Label("//cargo/remote:fuchsia-zircon-sys-0.3.3.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.fuchsia-zircon-sys-0.3.3.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "raze__futures__0_3_7",
-        url = "https://crates.io/api/v1/crates/futures/0.3.7/download",
+        name = "raze__futures__0_3_8",
+        url = "https://crates.io/api/v1/crates/futures/0.3.8/download",
         type = "tar.gz",
-        sha256 = "95314d38584ffbfda215621d723e0a3906f032e03ae5551e650058dac83d4797",
-        strip_prefix = "futures-0.3.7",
-        build_file = Label("//cargo/remote:futures-0.3.7.BUILD.bazel"),
+        sha256 = "9b3b0c040a1fe6529d30b3c5944b280c7f0dcb2930d2c3062bca967b602583d0",
+        strip_prefix = "futures-0.3.8",
+        build_file = Label("//cargo/remote:BUILD.futures-0.3.8.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "raze__futures_channel__0_3_7",
-        url = "https://crates.io/api/v1/crates/futures-channel/0.3.7/download",
+        name = "raze__futures_channel__0_3_8",
+        url = "https://crates.io/api/v1/crates/futures-channel/0.3.8/download",
         type = "tar.gz",
-        sha256 = "0448174b01148032eed37ac4aed28963aaaa8cfa93569a08e5b479bbc6c2c151",
-        strip_prefix = "futures-channel-0.3.7",
-        build_file = Label("//cargo/remote:futures-channel-0.3.7.BUILD.bazel"),
+        sha256 = "4b7109687aa4e177ef6fe84553af6280ef2778bdb7783ba44c9dc3399110fe64",
+        strip_prefix = "futures-channel-0.3.8",
+        build_file = Label("//cargo/remote:BUILD.futures-channel-0.3.8.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "raze__futures_core__0_3_7",
-        url = "https://crates.io/api/v1/crates/futures-core/0.3.7/download",
+        name = "raze__futures_core__0_3_8",
+        url = "https://crates.io/api/v1/crates/futures-core/0.3.8/download",
         type = "tar.gz",
-        sha256 = "18eaa56102984bed2c88ea39026cff3ce3b4c7f508ca970cedf2450ea10d4e46",
-        strip_prefix = "futures-core-0.3.7",
-        build_file = Label("//cargo/remote:futures-core-0.3.7.BUILD.bazel"),
+        sha256 = "847ce131b72ffb13b6109a221da9ad97a64cbe48feb1028356b836b47b8f1748",
+        strip_prefix = "futures-core-0.3.8",
+        build_file = Label("//cargo/remote:BUILD.futures-core-0.3.8.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "raze__futures_executor__0_3_7",
-        url = "https://crates.io/api/v1/crates/futures-executor/0.3.7/download",
+        name = "raze__futures_executor__0_3_8",
+        url = "https://crates.io/api/v1/crates/futures-executor/0.3.8/download",
         type = "tar.gz",
-        sha256 = "f5f8e0c9258abaea85e78ebdda17ef9666d390e987f006be6080dfe354b708cb",
-        strip_prefix = "futures-executor-0.3.7",
-        build_file = Label("//cargo/remote:futures-executor-0.3.7.BUILD.bazel"),
+        sha256 = "4caa2b2b68b880003057c1dd49f1ed937e38f22fcf6c212188a121f08cf40a65",
+        strip_prefix = "futures-executor-0.3.8",
+        build_file = Label("//cargo/remote:BUILD.futures-executor-0.3.8.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "raze__futures_io__0_3_7",
-        url = "https://crates.io/api/v1/crates/futures-io/0.3.7/download",
+        name = "raze__futures_io__0_3_8",
+        url = "https://crates.io/api/v1/crates/futures-io/0.3.8/download",
         type = "tar.gz",
-        sha256 = "6e1798854a4727ff944a7b12aa999f58ce7aa81db80d2dfaaf2ba06f065ddd2b",
-        strip_prefix = "futures-io-0.3.7",
-        build_file = Label("//cargo/remote:futures-io-0.3.7.BUILD.bazel"),
+        sha256 = "611834ce18aaa1bd13c4b374f5d653e1027cf99b6b502584ff8c9a64413b30bb",
+        strip_prefix = "futures-io-0.3.8",
+        build_file = Label("//cargo/remote:BUILD.futures-io-0.3.8.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "raze__futures_macro__0_3_7",
-        url = "https://crates.io/api/v1/crates/futures-macro/0.3.7/download",
+        name = "raze__futures_macro__0_3_8",
+        url = "https://crates.io/api/v1/crates/futures-macro/0.3.8/download",
         type = "tar.gz",
-        sha256 = "e36fccf3fc58563b4a14d265027c627c3b665d7fed489427e88e7cc929559efe",
-        strip_prefix = "futures-macro-0.3.7",
-        build_file = Label("//cargo/remote:futures-macro-0.3.7.BUILD.bazel"),
+        sha256 = "77408a692f1f97bcc61dc001d752e00643408fbc922e4d634c655df50d595556",
+        strip_prefix = "futures-macro-0.3.8",
+        build_file = Label("//cargo/remote:BUILD.futures-macro-0.3.8.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "raze__futures_sink__0_3_7",
-        url = "https://crates.io/api/v1/crates/futures-sink/0.3.7/download",
+        name = "raze__futures_sink__0_3_8",
+        url = "https://crates.io/api/v1/crates/futures-sink/0.3.8/download",
         type = "tar.gz",
-        sha256 = "0e3ca3f17d6e8804ae5d3df7a7d35b2b3a6fe89dac84b31872720fc3060a0b11",
-        strip_prefix = "futures-sink-0.3.7",
-        build_file = Label("//cargo/remote:futures-sink-0.3.7.BUILD.bazel"),
+        sha256 = "f878195a49cee50e006b02b93cf7e0a95a38ac7b776b4c4d9cc1207cd20fcb3d",
+        strip_prefix = "futures-sink-0.3.8",
+        build_file = Label("//cargo/remote:BUILD.futures-sink-0.3.8.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "raze__futures_task__0_3_7",
-        url = "https://crates.io/api/v1/crates/futures-task/0.3.7/download",
+        name = "raze__futures_task__0_3_8",
+        url = "https://crates.io/api/v1/crates/futures-task/0.3.8/download",
         type = "tar.gz",
-        sha256 = "96d502af37186c4fef99453df03e374683f8a1eec9dcc1e66b3b82dc8278ce3c",
-        strip_prefix = "futures-task-0.3.7",
-        build_file = Label("//cargo/remote:futures-task-0.3.7.BUILD.bazel"),
+        sha256 = "7c554eb5bf48b2426c4771ab68c6b14468b6e76cc90996f528c3338d761a4d0d",
+        strip_prefix = "futures-task-0.3.8",
+        build_file = Label("//cargo/remote:BUILD.futures-task-0.3.8.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "raze__futures_util__0_3_7",
-        url = "https://crates.io/api/v1/crates/futures-util/0.3.7/download",
+        name = "raze__futures_util__0_3_8",
+        url = "https://crates.io/api/v1/crates/futures-util/0.3.8/download",
         type = "tar.gz",
-        sha256 = "abcb44342f62e6f3e8ac427b8aa815f724fd705dfad060b18ac7866c15bb8e34",
-        strip_prefix = "futures-util-0.3.7",
-        build_file = Label("//cargo/remote:futures-util-0.3.7.BUILD.bazel"),
+        sha256 = "d304cff4a7b99cfb7986f7d43fbe93d175e72e704a8860787cc95e9ffd85cbd2",
+        strip_prefix = "futures-util-0.3.8",
+        build_file = Label("//cargo/remote:BUILD.futures-util-0.3.8.bazel"),
     )
 
     maybe(
@@ -718,7 +728,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c",
         strip_prefix = "fxhash-0.2.1",
-        build_file = Label("//cargo/remote:fxhash-0.2.1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.fxhash-0.2.1.bazel"),
     )
 
     maybe(
@@ -728,7 +738,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817",
         strip_prefix = "generic-array-0.14.4",
-        build_file = Label("//cargo/remote:generic-array-0.14.4.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.generic-array-0.14.4.bazel"),
     )
 
     maybe(
@@ -738,7 +748,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6",
         strip_prefix = "getrandom-0.1.15",
-        build_file = Label("//cargo/remote:getrandom-0.1.15.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.getrandom-0.1.15.bazel"),
     )
 
     maybe(
@@ -748,7 +758,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "1a5bcf1bbeab73aa4cf2fde60a846858dc036163c7c33bec309f8d17de785479",
         strip_prefix = "ghost-0.1.2",
-        build_file = Label("//cargo/remote:ghost-0.1.2.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.ghost-0.1.2.bazel"),
     )
 
     maybe(
@@ -758,7 +768,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce",
         strip_prefix = "gimli-0.23.0",
-        build_file = Label("//cargo/remote:gimli-0.23.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.gimli-0.23.0.bazel"),
     )
 
     maybe(
@@ -768,7 +778,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535",
         strip_prefix = "h2-0.2.7",
-        build_file = Label("//cargo/remote:h2-0.2.7.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.h2-0.2.7.bazel"),
     )
 
     maybe(
@@ -778,7 +788,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04",
         strip_prefix = "hashbrown-0.9.1",
-        build_file = Label("//cargo/remote:hashbrown-0.9.1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.hashbrown-0.9.1.bazel"),
     )
 
     maybe(
@@ -788,7 +798,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "d99cf782f0dc4372d26846bec3de7804ceb5df083c2d4462c0b8d2330e894fa8",
         strip_prefix = "hashlink-0.6.0",
-        build_file = Label("//cargo/remote:hashlink-0.6.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.hashlink-0.6.0.bazel"),
     )
 
     maybe(
@@ -798,7 +808,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205",
         strip_prefix = "heck-0.3.1",
-        build_file = Label("//cargo/remote:heck-0.3.1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.heck-0.3.1.bazel"),
     )
 
     maybe(
@@ -808,7 +818,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8",
         strip_prefix = "hermit-abi-0.1.17",
-        build_file = Label("//cargo/remote:hermit-abi-0.1.17.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.hermit-abi-0.1.17.bazel"),
     )
 
     maybe(
@@ -818,7 +828,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35",
         strip_prefix = "hex-0.4.2",
-        build_file = Label("//cargo/remote:hex-0.4.2.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.hex-0.4.2.bazel"),
     )
 
     maybe(
@@ -828,7 +838,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "e9025058dae765dee5070ec375f591e2ba14638c63feff74f13805a72e523163",
         strip_prefix = "htmlescape-0.3.1",
-        build_file = Label("//cargo/remote:htmlescape-0.3.1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.htmlescape-0.3.1.bazel"),
     )
 
     maybe(
@@ -838,7 +848,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9",
         strip_prefix = "http-0.2.1",
-        build_file = Label("//cargo/remote:http-0.2.1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.http-0.2.1.bazel"),
     )
 
     maybe(
@@ -848,7 +858,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b",
         strip_prefix = "http-body-0.3.1",
-        build_file = Label("//cargo/remote:http-body-0.3.1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.http-body-0.3.1.bazel"),
     )
 
     maybe(
@@ -858,7 +868,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9",
         strip_prefix = "httparse-1.3.4",
-        build_file = Label("//cargo/remote:httparse-1.3.4.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.httparse-1.3.4.bazel"),
     )
 
     maybe(
@@ -868,7 +878,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47",
         strip_prefix = "httpdate-0.3.2",
-        build_file = Label("//cargo/remote:httpdate-0.3.2.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.httpdate-0.3.2.bazel"),
     )
 
     maybe(
@@ -878,7 +888,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "b6cab2627acfc432780848602f3f558f7e9dd427352224b0d9324025796d2a5e",
         strip_prefix = "humansize-1.1.0",
-        build_file = Label("//cargo/remote:humansize-1.1.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.humansize-1.1.0.bazel"),
     )
 
     maybe(
@@ -888,7 +898,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "3c1ad908cc71012b7bea4d0c53ba96a8cba9962f048fa68d143376143d863b7a",
         strip_prefix = "humantime-2.0.1",
-        build_file = Label("//cargo/remote:humantime-2.0.1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.humantime-2.0.1.bazel"),
     )
 
     maybe(
@@ -898,7 +908,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "f6ad767baac13b44d4529fcf58ba2cd0995e36e7b435bc5b039de6f47e880dbf",
         strip_prefix = "hyper-0.13.9",
-        build_file = Label("//cargo/remote:hyper-0.13.9.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.hyper-0.13.9.bazel"),
     )
 
     maybe(
@@ -908,7 +918,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "37743cc83e8ee85eacfce90f2f4102030d9ff0a95244098d781e9bee4a90abb6",
         strip_prefix = "hyper-rustls-0.21.0",
-        build_file = Label("//cargo/remote:hyper-rustls-0.21.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.hyper-rustls-0.21.0.bazel"),
     )
 
     maybe(
@@ -917,7 +927,7 @@ def raze_fetch_remote_crates():
         remote = "https://github.com/ankitects/hyper-timeout.git",
         shallow_since = "1604362633 +1000",
         commit = "f9ef687120d88744c1da50a222e19208b4553503",
-        build_file = Label("//cargo/remote:hyper-timeout-0.3.1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.hyper-timeout-0.3.1.bazel"),
         init_submodules = True,
     )
 
@@ -928,7 +938,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9",
         strip_prefix = "idna-0.2.0",
-        build_file = Label("//cargo/remote:idna-0.2.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.idna-0.2.0.bazel"),
     )
 
     maybe(
@@ -938,7 +948,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "55e2e4c765aa53a0424761bf9f41aa7a6ac1efa87238f59560640e27fca028f2",
         strip_prefix = "indexmap-1.6.0",
-        build_file = Label("//cargo/remote:indexmap-1.6.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.indexmap-1.6.0.bazel"),
     )
 
     maybe(
@@ -948,7 +958,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8",
         strip_prefix = "indoc-0.3.6",
-        build_file = Label("//cargo/remote:indoc-0.3.6.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.indoc-0.3.6.bazel"),
     )
 
     maybe(
@@ -958,7 +968,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0",
         strip_prefix = "indoc-impl-0.3.6",
-        build_file = Label("//cargo/remote:indoc-impl-0.3.6.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.indoc-impl-0.3.6.bazel"),
     )
 
     maybe(
@@ -968,7 +978,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "cb1fc4429a33e1f80d41dc9fea4d108a88bec1de8053878898ae448a0b52f613",
         strip_prefix = "instant-0.1.8",
-        build_file = Label("//cargo/remote:instant-0.1.8.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.instant-0.1.8.bazel"),
     )
 
     maybe(
@@ -978,7 +988,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "8a0ed58ba6089d49f8a9a7d5e16fc9b9e2019cdf40ef270f3d465fa244d9630b",
         strip_prefix = "intl-memoizer-0.5.0",
-        build_file = Label("//cargo/remote:intl-memoizer-0.5.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.intl-memoizer-0.5.0.bazel"),
     )
 
     maybe(
@@ -988,7 +998,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "6c271cdb1f12a9feb3a017619c3ee681f971f270f6757341d6abe1f9f7a98bc3",
         strip_prefix = "intl_pluralrules-7.0.0",
-        build_file = Label("//cargo/remote:intl_pluralrules-7.0.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.intl_pluralrules-7.0.0.bazel"),
     )
 
     maybe(
@@ -998,7 +1008,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "fedd49de24d8c263613701406611410687148ae8c37cd6452650b250f753a0dd",
         strip_prefix = "inventory-0.1.9",
-        build_file = Label("//cargo/remote:inventory-0.1.9.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.inventory-0.1.9.bazel"),
     )
 
     maybe(
@@ -1008,7 +1018,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "ddead8880bc50f57fcd3b5869a7f6ff92570bb4e8f6870c22e2483272f2256da",
         strip_prefix = "inventory-impl-0.1.9",
-        build_file = Label("//cargo/remote:inventory-impl-0.1.9.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.inventory-impl-0.1.9.bazel"),
     )
 
     maybe(
@@ -1018,7 +1028,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e",
         strip_prefix = "iovec-0.1.4",
-        build_file = Label("//cargo/remote:iovec-0.1.4.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.iovec-0.1.4.bazel"),
     )
 
     maybe(
@@ -1028,7 +1038,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "47be2f14c678be2fdcab04ab1171db51b2762ce6f0a8ee87c8dd4a04ed216135",
         strip_prefix = "ipnet-2.3.0",
-        build_file = Label("//cargo/remote:ipnet-2.3.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.ipnet-2.3.0.bazel"),
     )
 
     maybe(
@@ -1038,7 +1048,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b",
         strip_prefix = "itertools-0.9.0",
-        build_file = Label("//cargo/remote:itertools-0.9.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.itertools-0.9.0.bazel"),
     )
 
     maybe(
@@ -1048,7 +1058,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6",
         strip_prefix = "itoa-0.4.6",
-        build_file = Label("//cargo/remote:itoa-0.4.6.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.itoa-0.4.6.bazel"),
     )
 
     maybe(
@@ -1058,7 +1068,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "ca059e81d9486668f12d455a4ea6daa600bd408134cd17e3d3fb5a32d1f016f8",
         strip_prefix = "js-sys-0.3.45",
-        build_file = Label("//cargo/remote:js-sys-0.3.45.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.js-sys-0.3.45.bazel"),
     )
 
     maybe(
@@ -1068,7 +1078,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d",
         strip_prefix = "kernel32-sys-0.2.2",
-        build_file = Label("//cargo/remote:kernel32-sys-0.2.2.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.kernel32-sys-0.2.2.bazel"),
     )
 
     maybe(
@@ -1078,7 +1088,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646",
         strip_prefix = "lazy_static-1.4.0",
-        build_file = Label("//cargo/remote:lazy_static-1.4.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.lazy_static-1.4.0.bazel"),
     )
 
     maybe(
@@ -1088,7 +1098,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "db65c6da02e61f55dae90a0ae427b2a5f6b3e8db09f58d10efab23af92592616",
         strip_prefix = "lexical-core-0.7.4",
-        build_file = Label("//cargo/remote:lexical-core-0.7.4.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.lexical-core-0.7.4.bazel"),
     )
 
     maybe(
@@ -1098,7 +1108,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614",
         strip_prefix = "libc-0.2.80",
-        build_file = Label("//cargo/remote:libc-0.2.80.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.libc-0.2.80.bazel"),
     )
 
     maybe(
@@ -1108,7 +1118,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "64d31059f22935e6c31830db5249ba2b7ecd54fd73a9909286f0a67aa55c2fbd",
         strip_prefix = "libsqlite3-sys-0.20.1",
-        build_file = Label("//cargo/remote:libsqlite3-sys-0.20.1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.libsqlite3-sys-0.20.1.bazel"),
     )
 
     maybe(
@@ -1118,7 +1128,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "28247cc5a5be2f05fbcd76dd0cf2c7d3b5400cb978a28042abcd4fa0b3f8261c",
         strip_prefix = "lock_api-0.4.1",
-        build_file = Label("//cargo/remote:lock_api-0.4.1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.lock_api-0.4.1.bazel"),
     )
 
     maybe(
@@ -1128,7 +1138,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b",
         strip_prefix = "log-0.4.11",
-        build_file = Label("//cargo/remote:log-0.4.11.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.log-0.4.11.bazel"),
     )
 
     maybe(
@@ -1138,7 +1148,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08",
         strip_prefix = "matches-0.1.8",
-        build_file = Label("//cargo/remote:matches-0.1.8.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.matches-0.1.8.bazel"),
     )
 
     maybe(
@@ -1148,7 +1158,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00",
         strip_prefix = "maybe-uninit-2.0.0",
-        build_file = Label("//cargo/remote:maybe-uninit-2.0.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.maybe-uninit-2.0.0.bazel"),
     )
 
     maybe(
@@ -1158,7 +1168,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525",
         strip_prefix = "memchr-2.3.4",
-        build_file = Label("//cargo/remote:memchr-2.3.4.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.memchr-2.3.4.bazel"),
     )
 
     maybe(
@@ -1168,7 +1178,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d",
         strip_prefix = "mime-0.3.16",
-        build_file = Label("//cargo/remote:mime-0.3.16.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.mime-0.3.16.bazel"),
     )
 
     maybe(
@@ -1178,7 +1188,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212",
         strip_prefix = "mime_guess-2.0.3",
-        build_file = Label("//cargo/remote:mime_guess-2.0.3.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.mime_guess-2.0.3.bazel"),
     )
 
     maybe(
@@ -1188,7 +1198,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d",
         strip_prefix = "miniz_oxide-0.4.3",
-        build_file = Label("//cargo/remote:miniz_oxide-0.4.3.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.miniz_oxide-0.4.3.bazel"),
     )
 
     maybe(
@@ -1198,7 +1208,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430",
         strip_prefix = "mio-0.6.22",
-        build_file = Label("//cargo/remote:mio-0.6.22.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.mio-0.6.22.bazel"),
     )
 
     maybe(
@@ -1208,7 +1218,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919",
         strip_prefix = "miow-0.2.1",
-        build_file = Label("//cargo/remote:miow-0.2.1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.miow-0.2.1.bazel"),
     )
 
     maybe(
@@ -1218,7 +1228,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "1255076139a83bb467426e7f8d0134968a8118844faa755985e077cf31850333",
         strip_prefix = "multimap-0.8.2",
-        build_file = Label("//cargo/remote:multimap-0.8.2.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.multimap-0.8.2.bazel"),
     )
 
     maybe(
@@ -1228,7 +1238,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "3ebc3ec692ed7c9a255596c67808dee269f64655d8baf7b4f0638e51ba1d6853",
         strip_prefix = "net2-0.2.35",
-        build_file = Label("//cargo/remote:net2-0.2.35.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.net2-0.2.35.bazel"),
     )
 
     maybe(
@@ -1238,7 +1248,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb",
         strip_prefix = "nodrop-0.1.14",
-        build_file = Label("//cargo/remote:nodrop-0.1.14.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.nodrop-0.1.14.bazel"),
     )
 
     maybe(
@@ -1248,7 +1258,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af",
         strip_prefix = "nom-5.1.2",
-        build_file = Label("//cargo/remote:nom-5.1.2.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.nom-5.1.2.bazel"),
     )
 
     maybe(
@@ -1258,7 +1268,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "bafe4179722c2894288ee77a9f044f02811c86af699344c498b0840c698a2465",
         strip_prefix = "num-format-0.4.0",
-        build_file = Label("//cargo/remote:num-format-0.4.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.num-format-0.4.0.bazel"),
     )
 
     maybe(
@@ -1268,7 +1278,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db",
         strip_prefix = "num-integer-0.1.44",
-        build_file = Label("//cargo/remote:num-integer-0.1.44.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.num-integer-0.1.44.bazel"),
     )
 
     maybe(
@@ -1278,7 +1288,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290",
         strip_prefix = "num-traits-0.2.14",
-        build_file = Label("//cargo/remote:num-traits-0.2.14.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.num-traits-0.2.14.bazel"),
     )
 
     maybe(
@@ -1288,7 +1298,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3",
         strip_prefix = "num_cpus-1.13.0",
-        build_file = Label("//cargo/remote:num_cpus-1.13.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.num_cpus-1.13.0.bazel"),
     )
 
     maybe(
@@ -1298,7 +1308,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "226b45a5c2ac4dd696ed30fa6b94b057ad909c7b7fc2e0d0808192bced894066",
         strip_prefix = "num_enum-0.5.1",
-        build_file = Label("//cargo/remote:num_enum-0.5.1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.num_enum-0.5.1.bazel"),
     )
 
     maybe(
@@ -1308,7 +1318,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "1c0fd9eba1d5db0994a239e09c1be402d35622277e35468ba891aa5e3188ce7e",
         strip_prefix = "num_enum_derive-0.5.1",
-        build_file = Label("//cargo/remote:num_enum_derive-0.5.1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.num_enum_derive-0.5.1.bazel"),
     )
 
     maybe(
@@ -1318,7 +1328,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397",
         strip_prefix = "object-0.22.0",
-        build_file = Label("//cargo/remote:object-0.22.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.object-0.22.0.bazel"),
     )
 
     maybe(
@@ -1328,7 +1338,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "260e51e7efe62b592207e9e13a68e43692a7a279171d6ba57abd208bf23645ad",
         strip_prefix = "once_cell-1.4.1",
-        build_file = Label("//cargo/remote:once_cell-1.4.1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.once_cell-1.4.1.bazel"),
     )
 
     maybe(
@@ -1338,7 +1348,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de",
         strip_prefix = "openssl-probe-0.1.2",
-        build_file = Label("//cargo/remote:openssl-probe-0.1.2.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.openssl-probe-0.1.2.bazel"),
     )
 
     maybe(
@@ -1348,7 +1358,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "a4893845fa2ca272e647da5d0e46660a314ead9c2fdd9a883aabc32e481a8733",
         strip_prefix = "parking_lot-0.11.0",
-        build_file = Label("//cargo/remote:parking_lot-0.11.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.parking_lot-0.11.0.bazel"),
     )
 
     maybe(
@@ -1358,7 +1368,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "c361aa727dd08437f2f1447be8b59a33b0edd15e0fcee698f935613d9efbca9b",
         strip_prefix = "parking_lot_core-0.8.0",
-        build_file = Label("//cargo/remote:parking_lot_core-0.8.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.parking_lot_core-0.8.0.bazel"),
     )
 
     maybe(
@@ -1368,7 +1378,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880",
         strip_prefix = "paste-0.1.18",
-        build_file = Label("//cargo/remote:paste-0.1.18.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.paste-0.1.18.bazel"),
     )
 
     maybe(
@@ -1378,7 +1388,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6",
         strip_prefix = "paste-impl-0.1.18",
-        build_file = Label("//cargo/remote:paste-impl-0.1.18.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.paste-impl-0.1.18.bazel"),
     )
 
     maybe(
@@ -1388,7 +1398,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e",
         strip_prefix = "percent-encoding-2.1.0",
-        build_file = Label("//cargo/remote:percent-encoding-2.1.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.percent-encoding-2.1.0.bazel"),
     )
 
     maybe(
@@ -1398,7 +1408,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "467d164a6de56270bd7c4d070df81d07beace25012d5103ced4e9ff08d6afdb7",
         strip_prefix = "petgraph-0.5.1",
-        build_file = Label("//cargo/remote:petgraph-0.5.1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.petgraph-0.5.1.bazel"),
     )
 
     maybe(
@@ -1408,7 +1418,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "2ffbc8e94b38ea3d2d8ba92aea2983b503cd75d0888d75b86bb37970b5698e15",
         strip_prefix = "pin-project-0.4.27",
-        build_file = Label("//cargo/remote:pin-project-0.4.27.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.pin-project-0.4.27.bazel"),
     )
 
     maybe(
@@ -1418,7 +1428,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "ee41d838744f60d959d7074e3afb6b35c7456d0f61cad38a24e35e6553f73841",
         strip_prefix = "pin-project-1.0.1",
-        build_file = Label("//cargo/remote:pin-project-1.0.1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.pin-project-1.0.1.bazel"),
     )
 
     maybe(
@@ -1428,7 +1438,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895",
         strip_prefix = "pin-project-internal-0.4.27",
-        build_file = Label("//cargo/remote:pin-project-internal-0.4.27.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.pin-project-internal-0.4.27.bazel"),
     )
 
     maybe(
@@ -1438,7 +1448,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "81a4ffa594b66bff340084d4081df649a7dc049ac8d7fc458d8e628bfbbb2f86",
         strip_prefix = "pin-project-internal-1.0.1",
-        build_file = Label("//cargo/remote:pin-project-internal-1.0.1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.pin-project-internal-1.0.1.bazel"),
     )
 
     maybe(
@@ -1448,7 +1458,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b",
         strip_prefix = "pin-project-lite-0.1.11",
-        build_file = Label("//cargo/remote:pin-project-lite-0.1.11.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.pin-project-lite-0.1.11.bazel"),
     )
 
     maybe(
@@ -1458,7 +1468,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184",
         strip_prefix = "pin-utils-0.1.0",
-        build_file = Label("//cargo/remote:pin-utils-0.1.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.pin-utils-0.1.0.bazel"),
     )
 
     maybe(
@@ -1468,7 +1478,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c",
         strip_prefix = "pkg-config-0.3.19",
-        build_file = Label("//cargo/remote:pkg-config-0.3.19.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.pkg-config-0.3.19.bazel"),
     )
 
     maybe(
@@ -1478,7 +1488,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "b18befed8bc2b61abc79a457295e7e838417326da1586050b919414073977f19",
         strip_prefix = "podio-0.1.7",
-        build_file = Label("//cargo/remote:podio-0.1.7.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.podio-0.1.7.bazel"),
     )
 
     maybe(
@@ -1488,7 +1498,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857",
         strip_prefix = "ppv-lite86-0.2.10",
-        build_file = Label("//cargo/remote:ppv-lite86-0.2.10.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.ppv-lite86-0.2.10.bazel"),
     )
 
     maybe(
@@ -1498,7 +1508,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785",
         strip_prefix = "proc-macro-crate-0.1.5",
-        build_file = Label("//cargo/remote:proc-macro-crate-0.1.5.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.proc-macro-crate-0.1.5.bazel"),
     )
 
     maybe(
@@ -1508,7 +1518,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5",
         strip_prefix = "proc-macro-hack-0.5.19",
-        build_file = Label("//cargo/remote:proc-macro-hack-0.5.19.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.proc-macro-hack-0.5.19.bazel"),
     )
 
     maybe(
@@ -1518,7 +1528,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a",
         strip_prefix = "proc-macro-nested-0.1.6",
-        build_file = Label("//cargo/remote:proc-macro-nested-0.1.6.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.proc-macro-nested-0.1.6.bazel"),
     )
 
     maybe(
@@ -1528,7 +1538,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71",
         strip_prefix = "proc-macro2-1.0.24",
-        build_file = Label("//cargo/remote:proc-macro2-1.0.24.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.proc-macro2-1.0.24.bazel"),
     )
 
     maybe(
@@ -1537,7 +1547,7 @@ def raze_fetch_remote_crates():
         remote = "https://github.com/danburkert/prost.git",
         shallow_since = "1598739849 -0700",
         commit = "4ded4a98ef339da0b7babd4efee3fbe8adaf746b",
-        build_file = Label("//cargo/remote:prost-0.6.1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.prost-0.6.1.bazel"),
         init_submodules = True,
     )
 
@@ -1547,7 +1557,7 @@ def raze_fetch_remote_crates():
         remote = "https://github.com/danburkert/prost.git",
         shallow_since = "1598739849 -0700",
         commit = "4ded4a98ef339da0b7babd4efee3fbe8adaf746b",
-        build_file = Label("//cargo/remote:prost-build-0.6.1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.prost-build-0.6.1.bazel"),
         init_submodules = True,
     )
 
@@ -1557,7 +1567,7 @@ def raze_fetch_remote_crates():
         remote = "https://github.com/danburkert/prost.git",
         shallow_since = "1598739849 -0700",
         commit = "4ded4a98ef339da0b7babd4efee3fbe8adaf746b",
-        build_file = Label("//cargo/remote:prost-derive-0.6.1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.prost-derive-0.6.1.bazel"),
         init_submodules = True,
     )
 
@@ -1567,7 +1577,7 @@ def raze_fetch_remote_crates():
         remote = "https://github.com/danburkert/prost.git",
         shallow_since = "1598739849 -0700",
         commit = "4ded4a98ef339da0b7babd4efee3fbe8adaf746b",
-        build_file = Label("//cargo/remote:prost-types-0.6.1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.prost-types-0.6.1.bazel"),
         init_submodules = True,
     )
 
@@ -1577,7 +1587,7 @@ def raze_fetch_remote_crates():
         remote = "https://github.com/PyO3/pyo3.git",
         shallow_since = "1603809036 +0900",
         commit = "3b3ba4e3abd57bc3b8f86444b3f61e6e2f4c5fc1",
-        build_file = Label("//cargo/remote:pyo3-0.12.3.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.pyo3-0.12.3.bazel"),
         init_submodules = True,
     )
 
@@ -1587,7 +1597,7 @@ def raze_fetch_remote_crates():
         remote = "https://github.com/PyO3/pyo3.git",
         shallow_since = "1603809036 +0900",
         commit = "3b3ba4e3abd57bc3b8f86444b3f61e6e2f4c5fc1",
-        build_file = Label("//cargo/remote:pyo3-derive-backend-0.12.3.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.pyo3-derive-backend-0.12.3.bazel"),
         init_submodules = True,
     )
 
@@ -1597,7 +1607,7 @@ def raze_fetch_remote_crates():
         remote = "https://github.com/PyO3/pyo3.git",
         shallow_since = "1603809036 +0900",
         commit = "3b3ba4e3abd57bc3b8f86444b3f61e6e2f4c5fc1",
-        build_file = Label("//cargo/remote:pyo3cls-0.12.3.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.pyo3cls-0.12.3.bazel"),
         init_submodules = True,
     )
 
@@ -1608,7 +1618,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37",
         strip_prefix = "quote-1.0.7",
-        build_file = Label("//cargo/remote:quote-1.0.7.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.quote-1.0.7.bazel"),
     )
 
     maybe(
@@ -1618,7 +1628,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03",
         strip_prefix = "rand-0.7.3",
-        build_file = Label("//cargo/remote:rand-0.7.3.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.rand-0.7.3.bazel"),
     )
 
     maybe(
@@ -1628,7 +1638,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402",
         strip_prefix = "rand_chacha-0.2.2",
-        build_file = Label("//cargo/remote:rand_chacha-0.2.2.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.rand_chacha-0.2.2.bazel"),
     )
 
     maybe(
@@ -1638,7 +1648,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19",
         strip_prefix = "rand_core-0.5.1",
-        build_file = Label("//cargo/remote:rand_core-0.5.1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.rand_core-0.5.1.bazel"),
     )
 
     maybe(
@@ -1648,7 +1658,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c",
         strip_prefix = "rand_hc-0.2.0",
-        build_file = Label("//cargo/remote:rand_hc-0.2.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.rand_hc-0.2.0.bazel"),
     )
 
     maybe(
@@ -1658,7 +1668,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce",
         strip_prefix = "redox_syscall-0.1.57",
-        build_file = Label("//cargo/remote:redox_syscall-0.1.57.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.redox_syscall-0.1.57.bazel"),
     )
 
     maybe(
@@ -1668,7 +1678,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d",
         strip_prefix = "redox_users-0.3.5",
-        build_file = Label("//cargo/remote:redox_users-0.3.5.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.redox_users-0.3.5.bazel"),
     )
 
     maybe(
@@ -1678,7 +1688,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c",
         strip_prefix = "regex-1.4.2",
-        build_file = Label("//cargo/remote:regex-1.4.2.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.regex-1.4.2.bazel"),
     )
 
     maybe(
@@ -1688,7 +1698,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189",
         strip_prefix = "regex-syntax-0.6.21",
-        build_file = Label("//cargo/remote:regex-syntax-0.6.21.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.regex-syntax-0.6.21.bazel"),
     )
 
     maybe(
@@ -1698,7 +1708,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7",
         strip_prefix = "remove_dir_all-0.5.3",
-        build_file = Label("//cargo/remote:remove_dir_all-0.5.3.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.remove_dir_all-0.5.3.bazel"),
     )
 
     maybe(
@@ -1708,7 +1718,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "8545debe98b2b139fb04cad8618b530e9b07c152d99a5de83c860b877d67847f",
         strip_prefix = "rental-0.5.5",
-        build_file = Label("//cargo/remote:rental-0.5.5.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.rental-0.5.5.bazel"),
     )
 
     maybe(
@@ -1718,7 +1728,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "475e68978dc5b743f2f40d8e0a8fdc83f1c5e78cbf4b8fa5e74e73beebc340de",
         strip_prefix = "rental-impl-0.5.5",
-        build_file = Label("//cargo/remote:rental-impl-0.5.5.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.rental-impl-0.5.5.bazel"),
     )
 
     maybe(
@@ -1727,7 +1737,7 @@ def raze_fetch_remote_crates():
         remote = "https://github.com/ankitects/reqwest.git",
         shallow_since = "1604362745 +1000",
         commit = "eab12efe22f370f386d99c7d90e7a964e85dd071",
-        build_file = Label("//cargo/remote:reqwest-0.10.8.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.reqwest-0.10.8.bazel"),
         init_submodules = True,
     )
 
@@ -1738,7 +1748,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "952cd6b98c85bbc30efa1ba5783b8abf12fec8b3287ffa52605b9432313e34e4",
         strip_prefix = "ring-0.16.15",
-        build_file = Label("//cargo/remote:ring-0.16.15.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.ring-0.16.15.bazel"),
     )
 
     maybe(
@@ -1748,7 +1758,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "7e3d4791ab5517217f51216a84a688b53c1ebf7988736469c538d02f46ddba68",
         strip_prefix = "rusqlite-0.24.1",
-        build_file = Label("//cargo/remote:rusqlite-0.24.1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.rusqlite-0.24.1.bazel"),
     )
 
     maybe(
@@ -1758,7 +1768,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "9dab61250775933275e84053ac235621dfb739556d5c54a2f2e9313b7cf43a19",
         strip_prefix = "rust-argon2-0.8.2",
-        build_file = Label("//cargo/remote:rust-argon2-0.8.2.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.rust-argon2-0.8.2.bazel"),
     )
 
     maybe(
@@ -1768,7 +1778,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232",
         strip_prefix = "rustc-demangle-0.1.18",
-        build_file = Label("//cargo/remote:rustc-demangle-0.1.18.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.rustc-demangle-0.1.18.bazel"),
     )
 
     maybe(
@@ -1778,7 +1788,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "5d1126dcf58e93cee7d098dbda643b5f92ed724f1f6a63007c1116eed6700c81",
         strip_prefix = "rustls-0.18.1",
-        build_file = Label("//cargo/remote:rustls-0.18.1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.rustls-0.18.1.bazel"),
     )
 
     maybe(
@@ -1788,7 +1798,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "629d439a7672da82dd955498445e496ee2096fe2117b9f796558a43fdb9e59b8",
         strip_prefix = "rustls-native-certs-0.4.0",
-        build_file = Label("//cargo/remote:rustls-native-certs-0.4.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.rustls-native-certs-0.4.0.bazel"),
     )
 
     maybe(
@@ -1798,7 +1808,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e",
         strip_prefix = "ryu-1.0.5",
-        build_file = Label("//cargo/remote:ryu-1.0.5.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.ryu-1.0.5.bazel"),
     )
 
     maybe(
@@ -1808,7 +1818,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75",
         strip_prefix = "schannel-0.1.19",
-        build_file = Label("//cargo/remote:schannel-0.1.19.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.schannel-0.1.19.bazel"),
     )
 
     maybe(
@@ -1818,7 +1828,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd",
         strip_prefix = "scopeguard-1.1.0",
-        build_file = Label("//cargo/remote:scopeguard-1.1.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.scopeguard-1.1.0.bazel"),
     )
 
     maybe(
@@ -1828,7 +1838,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "e3042af939fca8c3453b7af0f1c66e533a15a86169e39de2657310ade8f98d3c",
         strip_prefix = "sct-0.6.0",
-        build_file = Label("//cargo/remote:sct-0.6.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.sct-0.6.0.bazel"),
     )
 
     maybe(
@@ -1838,7 +1848,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "ad502866817f0575705bd7be36e2b2535cc33262d493aa733a2ec862baa2bc2b",
         strip_prefix = "security-framework-1.0.0",
-        build_file = Label("//cargo/remote:security-framework-1.0.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.security-framework-1.0.0.bazel"),
     )
 
     maybe(
@@ -1848,7 +1858,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "51ceb04988b17b6d1dcd555390fa822ca5637b4a14e1f5099f13d351bed4d6c7",
         strip_prefix = "security-framework-sys-1.0.0",
-        build_file = Label("//cargo/remote:security-framework-sys-1.0.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.security-framework-sys-1.0.0.bazel"),
     )
 
     maybe(
@@ -1858,7 +1868,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "b88fa983de7720629c9387e9f517353ed404164b1e482c970a90c1a4aaf7dc1a",
         strip_prefix = "serde-1.0.117",
-        build_file = Label("//cargo/remote:serde-1.0.117.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.serde-1.0.117.bazel"),
     )
 
     maybe(
@@ -1868,7 +1878,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "ae50f53d4b01e854319c1f5b854cd59471f054ea7e554988850d3f36ca1dc852",
         strip_prefix = "serde-aux-0.6.1",
-        build_file = Label("//cargo/remote:serde-aux-0.6.1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.serde-aux-0.6.1.bazel"),
     )
 
     maybe(
@@ -1878,7 +1888,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "cbd1ae72adb44aab48f325a02444a5fc079349a8d804c1fc922aed3f7454c74e",
         strip_prefix = "serde_derive-1.0.117",
-        build_file = Label("//cargo/remote:serde_derive-1.0.117.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.serde_derive-1.0.117.bazel"),
     )
 
     maybe(
@@ -1888,7 +1898,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "dcac07dbffa1c65e7f816ab9eba78eb142c6d44410f4eeba1e26e4f5dfa56b95",
         strip_prefix = "serde_json-1.0.59",
-        build_file = Label("//cargo/remote:serde_json-1.0.59.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.serde_json-1.0.59.bazel"),
     )
 
     maybe(
@@ -1898,7 +1908,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "2dc6b7951b17b051f3210b063f12cc17320e2fe30ae05b0fe2a3abb068551c76",
         strip_prefix = "serde_repr-0.1.6",
-        build_file = Label("//cargo/remote:serde_repr-0.1.6.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.serde_repr-0.1.6.bazel"),
     )
 
     maybe(
@@ -1908,7 +1918,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "f4f025b91216f15a2a32aa39669329a475733590a015835d1783549a56d09427",
         strip_prefix = "serde_tuple-0.5.0",
-        build_file = Label("//cargo/remote:serde_tuple-0.5.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.serde_tuple-0.5.0.bazel"),
     )
 
     maybe(
@@ -1918,7 +1928,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "4076151d1a2b688e25aaf236997933c66e18b870d0369f8b248b8ab2be630d7e",
         strip_prefix = "serde_tuple_macros-0.5.0",
-        build_file = Label("//cargo/remote:serde_tuple_macros-0.5.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.serde_tuple_macros-0.5.0.bazel"),
     )
 
     maybe(
@@ -1928,7 +1938,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97",
         strip_prefix = "serde_urlencoded-0.6.1",
-        build_file = Label("//cargo/remote:serde_urlencoded-0.6.1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.serde_urlencoded-0.6.1.bazel"),
     )
 
     maybe(
@@ -1938,7 +1948,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d",
         strip_prefix = "sha1-0.6.0",
-        build_file = Label("//cargo/remote:sha1-0.6.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.sha1-0.6.0.bazel"),
     )
 
     maybe(
@@ -1948,7 +1958,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8",
         strip_prefix = "slab-0.4.2",
-        build_file = Label("//cargo/remote:slab-0.4.2.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.slab-0.4.2.bazel"),
     )
 
     maybe(
@@ -1958,7 +1968,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "1cc9c640a4adbfbcc11ffb95efe5aa7af7309e002adab54b185507dbf2377b99",
         strip_prefix = "slog-2.5.2",
-        build_file = Label("//cargo/remote:slog-2.5.2.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.slog-2.5.2.bazel"),
     )
 
     maybe(
@@ -1968,7 +1978,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "51b3336ce47ce2f96673499fc07eb85e3472727b9a7a2959964b002c2ce8fbbb",
         strip_prefix = "slog-async-2.5.0",
-        build_file = Label("//cargo/remote:slog-async-2.5.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.slog-async-2.5.0.bazel"),
     )
 
     maybe(
@@ -1978,7 +1988,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "906a1a0bc43fed692df4b82a5e2fbfc3733db8dad8bb514ab27a4f23ad04f5c0",
         strip_prefix = "slog-envlogger-2.2.0",
-        build_file = Label("//cargo/remote:slog-envlogger-2.2.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.slog-envlogger-2.2.0.bazel"),
     )
 
     maybe(
@@ -1988,7 +1998,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "7c44c89dd8b0ae4537d1ae318353eaf7840b4869c536e31c41e963d1ea523ee6",
         strip_prefix = "slog-scope-4.3.0",
-        build_file = Label("//cargo/remote:slog-scope-4.3.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.slog-scope-4.3.0.bazel"),
     )
 
     maybe(
@@ -1998,7 +2008,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "8228ab7302adbf4fcb37e66f3cda78003feb521e7fd9e3847ec117a7784d0f5a",
         strip_prefix = "slog-stdlog-4.1.0",
-        build_file = Label("//cargo/remote:slog-stdlog-4.1.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.slog-stdlog-4.1.0.bazel"),
     )
 
     maybe(
@@ -2008,7 +2018,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "bab1d807cf71129b05ce36914e1dbb6fbfbdecaf686301cb457f4fa967f9f5b6",
         strip_prefix = "slog-term-2.6.0",
-        build_file = Label("//cargo/remote:slog-term-2.6.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.slog-term-2.6.0.bazel"),
     )
 
     maybe(
@@ -2018,7 +2028,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "fbee7696b84bbf3d89a1c2eccff0850e3047ed46bfcd2e92c29a2d074d57e252",
         strip_prefix = "smallvec-1.4.2",
-        build_file = Label("//cargo/remote:smallvec-1.4.2.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.smallvec-1.4.2.bazel"),
     )
 
     maybe(
@@ -2028,7 +2038,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "b1fa70dc5c8104ec096f4fe7ede7a221d35ae13dcd19ba1ad9a81d2cab9a1c44",
         strip_prefix = "socket2-0.3.15",
-        build_file = Label("//cargo/remote:socket2-0.3.15.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.socket2-0.3.15.bazel"),
     )
 
     maybe(
@@ -2038,7 +2048,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d",
         strip_prefix = "spin-0.5.2",
-        build_file = Label("//cargo/remote:spin-0.5.2.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.spin-0.5.2.bazel"),
     )
 
     maybe(
@@ -2048,7 +2058,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3",
         strip_prefix = "stable_deref_trait-1.2.0",
-        build_file = Label("//cargo/remote:stable_deref_trait-1.2.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.stable_deref_trait-1.2.0.bazel"),
     )
 
     maybe(
@@ -2058,7 +2068,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f",
         strip_prefix = "static_assertions-1.1.0",
-        build_file = Label("//cargo/remote:static_assertions-1.1.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.static_assertions-1.1.0.bazel"),
     )
 
     maybe(
@@ -2068,7 +2078,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "343f3f510c2915908f155e94f17220b19ccfacf2a64a2a5d8004f2c3e311e7fd",
         strip_prefix = "subtle-2.3.0",
-        build_file = Label("//cargo/remote:subtle-2.3.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.subtle-2.3.0.bazel"),
     )
 
     maybe(
@@ -2078,7 +2088,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac",
         strip_prefix = "syn-1.0.48",
-        build_file = Label("//cargo/remote:syn-1.0.48.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.syn-1.0.48.bazel"),
     )
 
     maybe(
@@ -2088,7 +2098,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701",
         strip_prefix = "synstructure-0.12.4",
-        build_file = Label("//cargo/remote:synstructure-0.12.4.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.synstructure-0.12.4.bazel"),
     )
 
     maybe(
@@ -2098,7 +2108,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60",
         strip_prefix = "take_mut-0.2.2",
-        build_file = Label("//cargo/remote:take_mut-0.2.2.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.take_mut-0.2.2.bazel"),
     )
 
     maybe(
@@ -2108,7 +2118,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9",
         strip_prefix = "tempfile-3.1.0",
-        build_file = Label("//cargo/remote:tempfile-3.1.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.tempfile-3.1.0.bazel"),
     )
 
     maybe(
@@ -2118,7 +2128,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "c0863a3345e70f61d613eab32ee046ccd1bcc5f9105fe402c61fcd0c13eeb8b5",
         strip_prefix = "term-0.6.1",
-        build_file = Label("//cargo/remote:term-0.6.1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.term-0.6.1.bazel"),
     )
 
     maybe(
@@ -2128,27 +2138,27 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f",
         strip_prefix = "termcolor-1.1.0",
-        build_file = Label("//cargo/remote:termcolor-1.1.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.termcolor-1.1.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "raze__thiserror__1_0_21",
-        url = "https://crates.io/api/v1/crates/thiserror/1.0.21/download",
+        name = "raze__thiserror__1_0_22",
+        url = "https://crates.io/api/v1/crates/thiserror/1.0.22/download",
         type = "tar.gz",
-        sha256 = "318234ffa22e0920fe9a40d7b8369b5f649d490980cf7aadcf1eb91594869b42",
-        strip_prefix = "thiserror-1.0.21",
-        build_file = Label("//cargo/remote:thiserror-1.0.21.BUILD.bazel"),
+        sha256 = "0e9ae34b84616eedaaf1e9dd6026dbe00dcafa92aa0c8077cb69df1fcfe5e53e",
+        strip_prefix = "thiserror-1.0.22",
+        build_file = Label("//cargo/remote:BUILD.thiserror-1.0.22.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "raze__thiserror_impl__1_0_21",
-        url = "https://crates.io/api/v1/crates/thiserror-impl/1.0.21/download",
+        name = "raze__thiserror_impl__1_0_22",
+        url = "https://crates.io/api/v1/crates/thiserror-impl/1.0.22/download",
         type = "tar.gz",
-        sha256 = "cae2447b6282786c3493999f40a9be2a6ad20cb8bd268b0a0dbf5a065535c0ab",
-        strip_prefix = "thiserror-impl-1.0.21",
-        build_file = Label("//cargo/remote:thiserror-impl-1.0.21.BUILD.bazel"),
+        sha256 = "9ba20f23e85b10754cd195504aebf6a27e2e6cbe28c17778a0c930724628dd56",
+        strip_prefix = "thiserror-impl-1.0.22",
+        build_file = Label("//cargo/remote:BUILD.thiserror-impl-1.0.22.bazel"),
     )
 
     maybe(
@@ -2158,7 +2168,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14",
         strip_prefix = "thread_local-1.0.1",
-        build_file = Label("//cargo/remote:thread_local-1.0.1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.thread_local-1.0.1.bazel"),
     )
 
     maybe(
@@ -2168,7 +2178,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255",
         strip_prefix = "time-0.1.44",
-        build_file = Label("//cargo/remote:time-0.1.44.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.time-0.1.44.bazel"),
     )
 
     maybe(
@@ -2178,7 +2188,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "29738eedb4388d9ea620eeab9384884fc3f06f586a2eddb56bedc5885126c7c1",
         strip_prefix = "tinystr-0.3.4",
-        build_file = Label("//cargo/remote:tinystr-0.3.4.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.tinystr-0.3.4.bazel"),
     )
 
     maybe(
@@ -2188,7 +2198,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "238ce071d267c5710f9d31451efec16c5ee22de34df17cc05e56cbc92e967117",
         strip_prefix = "tinyvec-0.3.4",
-        build_file = Label("//cargo/remote:tinyvec-0.3.4.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.tinyvec-0.3.4.bazel"),
     )
 
     maybe(
@@ -2198,7 +2208,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "5d34ca54d84bf2b5b4d7d31e901a8464f7b60ac145a284fba25ceb801f2ddccd",
         strip_prefix = "tokio-0.2.22",
-        build_file = Label("//cargo/remote:tokio-0.2.22.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.tokio-0.2.22.bazel"),
     )
 
     maybe(
@@ -2207,7 +2217,7 @@ def raze_fetch_remote_crates():
         remote = "https://github.com/ankitects/tokio-io-timeout.git",
         shallow_since = "1598411535 +1000",
         commit = "96e1358555c49905de89170f2b1102a7d8b6c4c2",
-        build_file = Label("//cargo/remote:tokio-io-timeout-0.4.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.tokio-io-timeout-0.4.0.bazel"),
         init_submodules = True,
     )
 
@@ -2218,7 +2228,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "e12831b255bcfa39dc0436b01e19fea231a37db570686c06ee72c423479f889a",
         strip_prefix = "tokio-rustls-0.14.1",
-        build_file = Label("//cargo/remote:tokio-rustls-0.14.1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.tokio-rustls-0.14.1.bazel"),
     )
 
     maybe(
@@ -2228,7 +2238,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "d611fd5d241872372d52a0a3d309c52d0b95a6a67671a6c8f7ab2c4a37fb2539",
         strip_prefix = "tokio-socks-0.3.0",
-        build_file = Label("//cargo/remote:tokio-socks-0.3.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.tokio-socks-0.3.0.bazel"),
     )
 
     maybe(
@@ -2238,7 +2248,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499",
         strip_prefix = "tokio-util-0.3.1",
-        build_file = Label("//cargo/remote:tokio-util-0.3.1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.tokio-util-0.3.1.bazel"),
     )
 
     maybe(
@@ -2248,7 +2258,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "75cf45bb0bef80604d001caaec0d09da99611b3c0fd39d3080468875cdb65645",
         strip_prefix = "toml-0.5.7",
-        build_file = Label("//cargo/remote:toml-0.5.7.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.toml-0.5.7.bazel"),
     )
 
     maybe(
@@ -2258,7 +2268,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860",
         strip_prefix = "tower-service-0.3.0",
-        build_file = Label("//cargo/remote:tower-service-0.3.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.tower-service-0.3.0.bazel"),
     )
 
     maybe(
@@ -2268,7 +2278,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "b0987850db3733619253fe60e17cb59b82d37c7e6c0236bb81e4d6b87c879f27",
         strip_prefix = "tracing-0.1.21",
-        build_file = Label("//cargo/remote:tracing-0.1.21.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.tracing-0.1.21.bazel"),
     )
 
     maybe(
@@ -2278,7 +2288,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f",
         strip_prefix = "tracing-core-0.1.17",
-        build_file = Label("//cargo/remote:tracing-core-0.1.17.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.tracing-core-0.1.17.bazel"),
     )
 
     maybe(
@@ -2288,7 +2298,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "ab7bb6f14721aa00656086e9335d363c5c8747bae02ebe32ea2c7dece5689b4c",
         strip_prefix = "tracing-futures-0.2.4",
-        build_file = Label("//cargo/remote:tracing-futures-0.2.4.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.tracing-futures-0.2.4.bazel"),
     )
 
     maybe(
@@ -2298,7 +2308,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642",
         strip_prefix = "try-lock-0.2.3",
-        build_file = Label("//cargo/remote:try-lock-0.2.3.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.try-lock-0.2.3.bazel"),
     )
 
     maybe(
@@ -2308,7 +2318,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "9d2741b1474c327d95c1f1e3b0a2c3977c8e128409c572a33af2914e7d636717",
         strip_prefix = "type-map-0.3.0",
-        build_file = Label("//cargo/remote:type-map-0.3.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.type-map-0.3.0.bazel"),
     )
 
     maybe(
@@ -2318,7 +2328,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33",
         strip_prefix = "typenum-1.12.0",
-        build_file = Label("//cargo/remote:typenum-1.12.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.typenum-1.12.0.bazel"),
     )
 
     maybe(
@@ -2328,7 +2338,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "73328fcd730a030bdb19ddf23e192187a6b01cd98be6d3140622a89129459ce5",
         strip_prefix = "unic-langid-0.9.0",
-        build_file = Label("//cargo/remote:unic-langid-0.9.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.unic-langid-0.9.0.bazel"),
     )
 
     maybe(
@@ -2338,7 +2348,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "1a4a8eeaf0494862c1404c95ec2f4c33a2acff5076f64314b465e3ddae1b934d",
         strip_prefix = "unic-langid-impl-0.9.0",
-        build_file = Label("//cargo/remote:unic-langid-impl-0.9.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.unic-langid-impl-0.9.0.bazel"),
     )
 
     maybe(
@@ -2348,7 +2358,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "18f980d6d87e8805f2836d64b4138cc95aa7986fa63b1f51f67d5fbff64dd6e5",
         strip_prefix = "unic-langid-macros-0.9.0",
-        build_file = Label("//cargo/remote:unic-langid-macros-0.9.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.unic-langid-macros-0.9.0.bazel"),
     )
 
     maybe(
@@ -2358,7 +2368,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "29396ffd97e27574c3e01368b1a64267d3064969e4848e2e130ff668be9daa9f",
         strip_prefix = "unic-langid-macros-impl-0.9.0",
-        build_file = Label("//cargo/remote:unic-langid-macros-impl-0.9.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.unic-langid-macros-impl-0.9.0.bazel"),
     )
 
     maybe(
@@ -2368,7 +2378,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6",
         strip_prefix = "unicase-2.6.0",
-        build_file = Label("//cargo/remote:unicase-2.6.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.unicase-2.6.0.bazel"),
     )
 
     maybe(
@@ -2378,7 +2388,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5",
         strip_prefix = "unicode-bidi-0.3.4",
-        build_file = Label("//cargo/remote:unicode-bidi-0.3.4.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.unicode-bidi-0.3.4.bazel"),
     )
 
     maybe(
@@ -2388,7 +2398,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977",
         strip_prefix = "unicode-normalization-0.1.13",
-        build_file = Label("//cargo/remote:unicode-normalization-0.1.13.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.unicode-normalization-0.1.13.bazel"),
     )
 
     maybe(
@@ -2398,7 +2408,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0",
         strip_prefix = "unicode-segmentation-1.6.0",
-        build_file = Label("//cargo/remote:unicode-segmentation-1.6.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.unicode-segmentation-1.6.0.bazel"),
     )
 
     maybe(
@@ -2408,7 +2418,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564",
         strip_prefix = "unicode-xid-0.2.1",
-        build_file = Label("//cargo/remote:unicode-xid-0.2.1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.unicode-xid-0.2.1.bazel"),
     )
 
     maybe(
@@ -2418,7 +2428,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7",
         strip_prefix = "unindent-0.1.7",
-        build_file = Label("//cargo/remote:unindent-0.1.7.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.unindent-0.1.7.bazel"),
     )
 
     maybe(
@@ -2428,17 +2438,17 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a",
         strip_prefix = "untrusted-0.7.1",
-        build_file = Label("//cargo/remote:untrusted-0.7.1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.untrusted-0.7.1.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "raze__url__2_1_1",
-        url = "https://crates.io/api/v1/crates/url/2.1.1/download",
+        name = "raze__url__2_2_0",
+        url = "https://crates.io/api/v1/crates/url/2.2.0/download",
         type = "tar.gz",
-        sha256 = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb",
-        strip_prefix = "url-2.1.1",
-        build_file = Label("//cargo/remote:url-2.1.1.BUILD.bazel"),
+        sha256 = "5909f2b0817350449ed73e8bcd81c8c3c8d9a7a5d8acba4b27db277f1868976e",
+        strip_prefix = "url-2.2.0",
+        build_file = Label("//cargo/remote:BUILD.url-2.2.0.bazel"),
     )
 
     maybe(
@@ -2448,7 +2458,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "91baa0c65eabd12fcbdac8cc35ff16159cab95cae96d0222d6d0271db6193cef",
         strip_prefix = "utime-0.3.1",
-        build_file = Label("//cargo/remote:utime-0.3.1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.utime-0.3.1.bazel"),
     )
 
     maybe(
@@ -2458,7 +2468,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c",
         strip_prefix = "vcpkg-0.2.10",
-        build_file = Label("//cargo/remote:vcpkg-0.2.10.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.vcpkg-0.2.10.bazel"),
     )
 
     maybe(
@@ -2468,7 +2478,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed",
         strip_prefix = "version_check-0.9.2",
-        build_file = Label("//cargo/remote:version_check-0.9.2.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.version_check-0.9.2.bazel"),
     )
 
     maybe(
@@ -2478,7 +2488,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0",
         strip_prefix = "want-0.3.0",
-        build_file = Label("//cargo/remote:want-0.3.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.want-0.3.0.bazel"),
     )
 
     maybe(
@@ -2488,7 +2498,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f",
         strip_prefix = "wasi-0.10.0+wasi-snapshot-preview1",
-        build_file = Label("//cargo/remote:wasi-0.10.0+wasi-snapshot-preview1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.wasi-0.10.0+wasi-snapshot-preview1.bazel"),
     )
 
     maybe(
@@ -2498,7 +2508,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519",
         strip_prefix = "wasi-0.9.0+wasi-snapshot-preview1",
-        build_file = Label("//cargo/remote:wasi-0.9.0+wasi-snapshot-preview1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.wasi-0.9.0+wasi-snapshot-preview1.bazel"),
     )
 
     maybe(
@@ -2508,7 +2518,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "1ac64ead5ea5f05873d7c12b545865ca2b8d28adfc50a49b84770a3a97265d42",
         strip_prefix = "wasm-bindgen-0.2.68",
-        build_file = Label("//cargo/remote:wasm-bindgen-0.2.68.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.wasm-bindgen-0.2.68.bazel"),
     )
 
     maybe(
@@ -2518,7 +2528,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "f22b422e2a757c35a73774860af8e112bff612ce6cb604224e8e47641a9e4f68",
         strip_prefix = "wasm-bindgen-backend-0.2.68",
-        build_file = Label("//cargo/remote:wasm-bindgen-backend-0.2.68.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.wasm-bindgen-backend-0.2.68.bazel"),
     )
 
     maybe(
@@ -2528,7 +2538,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "b7866cab0aa01de1edf8b5d7936938a7e397ee50ce24119aef3e1eaa3b6171da",
         strip_prefix = "wasm-bindgen-futures-0.4.18",
-        build_file = Label("//cargo/remote:wasm-bindgen-futures-0.4.18.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.wasm-bindgen-futures-0.4.18.bazel"),
     )
 
     maybe(
@@ -2538,7 +2548,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "6b13312a745c08c469f0b292dd2fcd6411dba5f7160f593da6ef69b64e407038",
         strip_prefix = "wasm-bindgen-macro-0.2.68",
-        build_file = Label("//cargo/remote:wasm-bindgen-macro-0.2.68.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.wasm-bindgen-macro-0.2.68.bazel"),
     )
 
     maybe(
@@ -2548,7 +2558,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "f249f06ef7ee334cc3b8ff031bfc11ec99d00f34d86da7498396dc1e3b1498fe",
         strip_prefix = "wasm-bindgen-macro-support-0.2.68",
-        build_file = Label("//cargo/remote:wasm-bindgen-macro-support-0.2.68.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.wasm-bindgen-macro-support-0.2.68.bazel"),
     )
 
     maybe(
@@ -2558,7 +2568,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "1d649a3145108d7d3fbcde896a468d1bd636791823c9921135218ad89be08307",
         strip_prefix = "wasm-bindgen-shared-0.2.68",
-        build_file = Label("//cargo/remote:wasm-bindgen-shared-0.2.68.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.wasm-bindgen-shared-0.2.68.bazel"),
     )
 
     maybe(
@@ -2568,7 +2578,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "4bf6ef87ad7ae8008e15a355ce696bed26012b7caa21605188cfd8214ab51e2d",
         strip_prefix = "web-sys-0.3.45",
-        build_file = Label("//cargo/remote:web-sys-0.3.45.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.web-sys-0.3.45.bazel"),
     )
 
     maybe(
@@ -2578,7 +2588,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "ab146130f5f790d45f82aeeb09e55a256573373ec64409fc19a6fb82fb1032ae",
         strip_prefix = "webpki-0.21.3",
-        build_file = Label("//cargo/remote:webpki-0.21.3.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.webpki-0.21.3.bazel"),
     )
 
     maybe(
@@ -2588,7 +2598,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "87c14ef7e1b8b8ecfc75d5eca37949410046e66f15d185c01d70824f1f8111ef",
         strip_prefix = "which-4.0.2",
-        build_file = Label("//cargo/remote:which-4.0.2.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.which-4.0.2.bazel"),
     )
 
     maybe(
@@ -2598,7 +2608,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a",
         strip_prefix = "winapi-0.2.8",
-        build_file = Label("//cargo/remote:winapi-0.2.8.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.winapi-0.2.8.bazel"),
     )
 
     maybe(
@@ -2608,7 +2618,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419",
         strip_prefix = "winapi-0.3.9",
-        build_file = Label("//cargo/remote:winapi-0.3.9.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.winapi-0.3.9.bazel"),
     )
 
     maybe(
@@ -2618,7 +2628,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc",
         strip_prefix = "winapi-build-0.1.1",
-        build_file = Label("//cargo/remote:winapi-build-0.1.1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.winapi-build-0.1.1.bazel"),
     )
 
     maybe(
@@ -2628,7 +2638,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6",
         strip_prefix = "winapi-i686-pc-windows-gnu-0.4.0",
-        build_file = Label("//cargo/remote:winapi-i686-pc-windows-gnu-0.4.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.winapi-i686-pc-windows-gnu-0.4.0.bazel"),
     )
 
     maybe(
@@ -2638,7 +2648,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178",
         strip_prefix = "winapi-util-0.1.5",
-        build_file = Label("//cargo/remote:winapi-util-0.1.5.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.winapi-util-0.1.5.bazel"),
     )
 
     maybe(
@@ -2648,7 +2658,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f",
         strip_prefix = "winapi-x86_64-pc-windows-gnu-0.4.0",
-        build_file = Label("//cargo/remote:winapi-x86_64-pc-windows-gnu-0.4.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.winapi-x86_64-pc-windows-gnu-0.4.0.bazel"),
     )
 
     maybe(
@@ -2658,7 +2668,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69",
         strip_prefix = "winreg-0.7.0",
-        build_file = Label("//cargo/remote:winreg-0.7.0.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.winreg-0.7.0.bazel"),
     )
 
     maybe(
@@ -2668,7 +2678,7 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e",
         strip_prefix = "ws2_32-sys-0.2.1",
-        build_file = Label("//cargo/remote:ws2_32-sys-0.2.1.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.ws2_32-sys-0.2.1.bazel"),
     )
 
     maybe(
@@ -2678,5 +2688,5 @@ def raze_fetch_remote_crates():
         type = "tar.gz",
         sha256 = "58287c28d78507f5f91f2a4cf1e8310e2c76fd4c6932f93ac60fd1ceb402db7d",
         strip_prefix = "zip-0.5.6",
-        build_file = Label("//cargo/remote:zip-0.5.6.BUILD.bazel"),
+        build_file = Label("//cargo/remote:BUILD.zip-0.5.6.bazel"),
     )
diff --git a/cargo/raze.toml b/cargo/raze.toml
index 2d4893059..783f950b9 100644
--- a/cargo/raze.toml
+++ b/cargo/raze.toml
@@ -7,7 +7,7 @@ edition = "2018"
 name = "anki"
 path = "src/lib.rs"
 
-[raze]
+[package.metadata.raze]
 workspace_path = "//cargo"
 targets = [
     "i686-apple-darwin",
@@ -22,13 +22,13 @@ targets = [
 genmode = "Remote"
 default_gen_buildrs = true
 
-[raze.crates.pyo3.'0.12.3']
+[package.metadata.raze.crates.pyo3.'*']
 data_attr = "glob([\"**\"])"
 
-[raze.crates.ring.'0.16.15']
+[package.metadata.raze.crates.ring.'*']
 data_attr = "glob([\"src/**\"])"
 
-[raze.crates.webpki.'0.21.3']
+[package.metadata.raze.crates.webpki.'*']
 data_attr = "glob([\"src/**\"])"
 
 # WARNING: don't edit the dependencies below, they are generated by update.py
diff --git a/cargo/remote/addr2line-0.14.0.BUILD.bazel b/cargo/remote/BUILD.addr2line-0.14.0.bazel
similarity index 95%
rename from cargo/remote/addr2line-0.14.0.BUILD.bazel
rename to cargo/remote/BUILD.addr2line-0.14.0.bazel
index b77983eac..a77355b78 100644
--- a/cargo/remote/addr2line-0.14.0.BUILD.bazel
+++ b/cargo/remote/BUILD.addr2line-0.14.0.bazel
@@ -28,30 +28,34 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0 OR MIT"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "addr2line" with type "example" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "addr2line",
-    crate_type = "lib",
-    deps = [
-        "@raze__gimli__0_23_0//:gimli",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.14.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.14.0",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__gimli__0_23_0//:gimli",
     ],
 )
+
 # Unsupported target "correctness" with type "test" omitted
+
 # Unsupported target "output_equivalence" with type "test" omitted
+
 # Unsupported target "parse" with type "test" omitted
diff --git a/cargo/remote/adler-0.2.3.BUILD.bazel b/cargo/remote/BUILD.adler-0.2.3.bazel
similarity index 95%
rename from cargo/remote/adler-0.2.3.BUILD.bazel
rename to cargo/remote/BUILD.adler-0.2.3.bazel
index 61d42c0b9..f956990cb 100644
--- a/cargo/remote/adler-0.2.3.BUILD.bazel
+++ b/cargo/remote/BUILD.adler-0.2.3.bazel
@@ -28,26 +28,27 @@ licenses([
     "notice",  # MIT from expression "0BSD OR (MIT OR Apache-2.0)"
 ])
 
-# Generated targets
+# Generated Targets
+
+# Unsupported target "bench" with type "bench" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "adler",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.2.3",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.2.3",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
-# Unsupported target "bench" with type "bench" omitted
diff --git a/cargo/remote/ahash-0.4.6.BUILD.bazel b/cargo/remote/BUILD.ahash-0.4.6.bazel
similarity index 95%
rename from cargo/remote/ahash-0.4.6.BUILD.bazel
rename to cargo/remote/BUILD.ahash-0.4.6.bazel
index 9c7b26962..4a66e7691 100644
--- a/cargo/remote/ahash-0.4.6.BUILD.bazel
+++ b/cargo/remote/BUILD.ahash-0.4.6.bazel
@@ -28,30 +28,35 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "ahash" with type "bench" omitted
 
-# buildifier: leave-alone
+# Unsupported target "map" with type "bench" omitted
+
 rust_library(
     name = "ahash",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.4.6",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.4.6",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
+
 # Unsupported target "bench" with type "test" omitted
-# Unsupported target "map" with type "bench" omitted
+
 # Unsupported target "map_tests" with type "test" omitted
+
 # Unsupported target "nopanic" with type "test" omitted
diff --git a/cargo/remote/aho-corasick-0.7.14.BUILD.bazel b/cargo/remote/BUILD.aho-corasick-0.7.15.bazel
similarity index 93%
rename from cargo/remote/aho-corasick-0.7.14.BUILD.bazel
rename to cargo/remote/BUILD.aho-corasick-0.7.15.bazel
index 826cd0917..0c8d76f29 100644
--- a/cargo/remote/aho-corasick-0.7.14.BUILD.bazel
+++ b/cargo/remote/BUILD.aho-corasick-0.7.15.bazel
@@ -28,28 +28,28 @@ licenses([
     "unencumbered",  # Unlicense from expression "Unlicense OR MIT"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "aho_corasick",
-    crate_type = "lib",
-    deps = [
-        "@raze__memchr__2_3_4//:memchr",
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.7.14",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "default",
         "std",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.7.15",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__memchr__2_3_4//:memchr",
+    ],
 )
diff --git a/cargo/remote/anyhow-1.0.34.BUILD.bazel b/cargo/remote/BUILD.anyhow-1.0.34.bazel
similarity index 94%
rename from cargo/remote/anyhow-1.0.34.BUILD.bazel
rename to cargo/remote/BUILD.anyhow-1.0.34.bazel
index cb9148b0e..ca89169ff 100644
--- a/cargo/remote/anyhow-1.0.34.BUILD.bazel
+++ b/cargo/remote/BUILD.anyhow-1.0.34.bazel
@@ -28,72 +28,81 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "anyhow_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build.rs",
-    edition = "2018",
-    deps = [
+    build_script_env = {
+    },
+    crate_features = [
+        "default",
+        "std",
     ],
+    crate_root = "build.rs",
+    data = glob(["**"]),
+    edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    crate_features = [
-      "default",
-      "std",
-    ],
-    build_script_env = {
-    },
-    data = glob(["**"]),
     tags = [
         "cargo-raze",
         "manual",
     ],
     version = "1.0.34",
     visibility = ["//visibility:private"],
+    deps = [
+    ],
 )
 
-
-# buildifier: leave-alone
 rust_library(
     name = "anyhow",
-    crate_type = "lib",
-    deps = [
-        ":anyhow_build_script",
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "1.0.34",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "default",
         "std",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "1.0.34",
+    # buildifier: leave-alone
+    deps = [
+        ":anyhow_build_script",
+    ],
 )
+
 # Unsupported target "compiletest" with type "test" omitted
+
 # Unsupported target "test_autotrait" with type "test" omitted
+
 # Unsupported target "test_backtrace" with type "test" omitted
+
 # Unsupported target "test_boxed" with type "test" omitted
+
 # Unsupported target "test_chain" with type "test" omitted
+
 # Unsupported target "test_context" with type "test" omitted
+
 # Unsupported target "test_convert" with type "test" omitted
+
 # Unsupported target "test_downcast" with type "test" omitted
+
 # Unsupported target "test_fmt" with type "test" omitted
+
 # Unsupported target "test_macros" with type "test" omitted
+
 # Unsupported target "test_repr" with type "test" omitted
+
 # Unsupported target "test_source" with type "test" omitted
diff --git a/cargo/remote/arc-swap-0.4.7.BUILD.bazel b/cargo/remote/BUILD.arc-swap-0.4.7.bazel
similarity index 95%
rename from cargo/remote/arc-swap-0.4.7.BUILD.bazel
rename to cargo/remote/BUILD.arc-swap-0.4.7.bazel
index e4bd85d7a..5c0ea60a6 100644
--- a/cargo/remote/arc-swap-0.4.7.BUILD.bazel
+++ b/cargo/remote/BUILD.arc-swap-0.4.7.bazel
@@ -28,28 +28,31 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0 OR MIT"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "arc_swap",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.4.7",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.4.7",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
+
 # Unsupported target "random" with type "test" omitted
+
 # Unsupported target "stress" with type "test" omitted
+
 # Unsupported target "version" with type "test" omitted
diff --git a/cargo/remote/arrayref-0.3.6.BUILD.bazel b/cargo/remote/BUILD.arrayref-0.3.6.bazel
similarity index 95%
rename from cargo/remote/arrayref-0.3.6.BUILD.bazel
rename to cargo/remote/BUILD.arrayref-0.3.6.bazel
index dbb3ddf5c..b0fcfc8ad 100644
--- a/cargo/remote/arrayref-0.3.6.BUILD.bazel
+++ b/cargo/remote/BUILD.arrayref-0.3.6.bazel
@@ -28,28 +28,31 @@ licenses([
     "restricted",  # BSD-2-Clause from expression "BSD-2-Clause"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "array_refs" with type "example" omitted
+
 # Unsupported target "array_refs_with_const" with type "example" omitted
 
-# buildifier: leave-alone
+# Unsupported target "simple-case" with type "example" omitted
+
 rust_library(
     name = "arrayref",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.3.6",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.3.6",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
-# Unsupported target "simple-case" with type "example" omitted
diff --git a/cargo/remote/arrayvec-0.4.12.BUILD.bazel b/cargo/remote/BUILD.arrayvec-0.4.12.bazel
similarity index 93%
rename from cargo/remote/arrayvec-0.4.12.BUILD.bazel
rename to cargo/remote/BUILD.arrayvec-0.4.12.bazel
index 8d0674892..8647ea94e 100644
--- a/cargo/remote/arrayvec-0.4.12.BUILD.bazel
+++ b/cargo/remote/BUILD.arrayvec-0.4.12.bazel
@@ -28,65 +28,66 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "arrayvec_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build.rs",
-    edition = "2015",
-    deps = [
+    build_script_env = {
+    },
+    crate_features = [
+        "default",
+        "std",
     ],
+    crate_root = "build.rs",
+    data = glob(["**"]),
+    edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    crate_features = [
-      "default",
-      "std",
-    ],
-    build_script_env = {
-    },
-    data = glob(["**"]),
     tags = [
         "cargo-raze",
         "manual",
     ],
     version = "0.4.12",
     visibility = ["//visibility:private"],
+    deps = [
+    ],
 )
 
 # Unsupported target "arraystring" with type "bench" omitted
 
-# buildifier: leave-alone
+# Unsupported target "extend" with type "bench" omitted
+
 rust_library(
     name = "arrayvec",
-    crate_type = "lib",
-    deps = [
-        ":arrayvec_build_script",
-        "@raze__nodrop__0_1_14//:nodrop",
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.4.12",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "default",
         "std",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.4.12",
+    # buildifier: leave-alone
+    deps = [
+        ":arrayvec_build_script",
+        "@raze__nodrop__0_1_14//:nodrop",
+    ],
 )
-# Unsupported target "extend" with type "bench" omitted
+
 # Unsupported target "serde" with type "test" omitted
+
 # Unsupported target "tests" with type "test" omitted
diff --git a/cargo/remote/arrayvec-0.5.2.BUILD.bazel b/cargo/remote/BUILD.arrayvec-0.5.2.bazel
similarity index 95%
rename from cargo/remote/arrayvec-0.5.2.BUILD.bazel
rename to cargo/remote/BUILD.arrayvec-0.5.2.bazel
index d5bfc5e34..001842bcb 100644
--- a/cargo/remote/arrayvec-0.5.2.BUILD.bazel
+++ b/cargo/remote/BUILD.arrayvec-0.5.2.bazel
@@ -28,32 +28,36 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "arraystring" with type "bench" omitted
 
-# buildifier: leave-alone
+# Unsupported target "extend" with type "bench" omitted
+
 rust_library(
     name = "arrayvec",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.5.2",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "array-sizes-33-128",
         "default",
         "std",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.5.2",
+    # buildifier: leave-alone
+    deps = [
+    ],
 )
-# Unsupported target "extend" with type "bench" omitted
+
 # Unsupported target "serde" with type "test" omitted
+
 # Unsupported target "tests" with type "test" omitted
diff --git a/cargo/remote/askama-0.10.3.BUILD.bazel b/cargo/remote/BUILD.askama-0.10.3.bazel
similarity index 96%
rename from cargo/remote/askama-0.10.3.BUILD.bazel
rename to cargo/remote/BUILD.askama-0.10.3.bazel
index b391b46bd..8da39505e 100644
--- a/cargo/remote/askama-0.10.3.BUILD.bazel
+++ b/cargo/remote/BUILD.askama-0.10.3.bazel
@@ -28,30 +28,11 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "askama",
-    crate_type = "lib",
-    deps = [
-        "@raze__askama_escape__0_10_1//:askama_escape",
-        "@raze__askama_shared__0_10_4//:askama_shared",
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    proc_macro_deps = [
-        "@raze__askama_derive__0_10_3//:askama_derive",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.10.3",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "config",
         "default",
@@ -59,4 +40,23 @@ rust_library(
         "num-traits",
         "urlencode",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2018",
+    proc_macro_deps = [
+        "@raze__askama_derive__0_10_3//:askama_derive",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.10.3",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__askama_escape__0_10_1//:askama_escape",
+        "@raze__askama_shared__0_10_4//:askama_shared",
+    ],
 )
diff --git a/cargo/remote/askama_derive-0.10.3.BUILD.bazel b/cargo/remote/BUILD.askama_derive-0.10.3.bazel
similarity index 95%
rename from cargo/remote/askama_derive-0.10.3.BUILD.bazel
rename to cargo/remote/BUILD.askama_derive-0.10.3.bazel
index 656859cab..b3ec52f55 100644
--- a/cargo/remote/askama_derive-0.10.3.BUILD.bazel
+++ b/cargo/remote/BUILD.askama_derive-0.10.3.bazel
@@ -28,29 +28,29 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "askama_derive",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "proc-macro",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.10.3",
+    # buildifier: leave-alone
     deps = [
         "@raze__askama_shared__0_10_4//:askama_shared",
         "@raze__proc_macro2__1_0_24//:proc_macro2",
         "@raze__quote__1_0_7//:quote",
         "@raze__syn__1_0_48//:syn",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.10.3",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-    ],
 )
diff --git a/cargo/remote/askama_escape-0.10.1.BUILD.bazel b/cargo/remote/BUILD.askama_escape-0.10.1.bazel
similarity index 95%
rename from cargo/remote/askama_escape-0.10.1.BUILD.bazel
rename to cargo/remote/BUILD.askama_escape-0.10.1.bazel
index f7e1e5cf1..723dc0a26 100644
--- a/cargo/remote/askama_escape-0.10.1.BUILD.bazel
+++ b/cargo/remote/BUILD.askama_escape-0.10.1.bazel
@@ -28,26 +28,27 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "all" with type "bench" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "askama_escape",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.10.1",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.10.1",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
diff --git a/cargo/remote/askama_shared-0.10.4.BUILD.bazel b/cargo/remote/BUILD.askama_shared-0.10.4.bazel
similarity index 96%
rename from cargo/remote/askama_shared-0.10.4.BUILD.bazel
rename to cargo/remote/BUILD.askama_shared-0.10.4.bazel
index e92f17f93..35688655c 100644
--- a/cargo/remote/askama_shared-0.10.4.BUILD.bazel
+++ b/cargo/remote/BUILD.askama_shared-0.10.4.bazel
@@ -28,12 +28,31 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "askama_shared",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "config",
+        "humansize",
+        "num-traits",
+        "percent-encoding",
+        "serde",
+        "toml",
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.10.4",
+    # buildifier: leave-alone
     deps = [
         "@raze__askama_escape__0_10_1//:askama_escape",
         "@raze__humansize__1_1_0//:humansize",
@@ -46,23 +65,4 @@ rust_library(
         "@raze__syn__1_0_48//:syn",
         "@raze__toml__0_5_7//:toml",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.10.4",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-        "config",
-        "humansize",
-        "num-traits",
-        "percent-encoding",
-        "serde",
-        "toml",
-    ],
 )
diff --git a/cargo/remote/async-compression-0.3.5.BUILD.bazel b/cargo/remote/BUILD.async-compression-0.3.6.bazel
similarity index 86%
rename from cargo/remote/async-compression-0.3.5.BUILD.bazel
rename to cargo/remote/BUILD.async-compression-0.3.6.bazel
index 6e1415c73..864500c18 100644
--- a/cargo/remote/async-compression-0.3.5.BUILD.bazel
+++ b/cargo/remote/BUILD.async-compression-0.3.6.bazel
@@ -28,30 +28,15 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
+
+# Unsupported target "zlib_tokio_02_write" with type "example" omitted
+
+# Unsupported target "zstd_gzip" with type "example" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "async_compression",
-    crate_type = "lib",
-    deps = [
-        "@raze__bytes__0_5_6//:bytes",
-        "@raze__flate2__1_0_19//:flate2",
-        "@raze__futures_core__0_3_7//:futures_core",
-        "@raze__memchr__2_3_4//:memchr",
-        "@raze__pin_project_lite__0_1_11//:pin_project_lite",
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.3.5",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "bytes",
         "default",
@@ -59,13 +44,41 @@ rust_library(
         "gzip",
         "stream",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.3.6",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__bytes__0_5_6//:bytes",
+        "@raze__flate2__1_0_19//:flate2",
+        "@raze__futures_core__0_3_8//:futures_core",
+        "@raze__memchr__2_3_4//:memchr",
+        "@raze__pin_project_lite__0_1_11//:pin_project_lite",
+    ],
 )
+
 # Unsupported target "brotli" with type "test" omitted
+
 # Unsupported target "bzip2" with type "test" omitted
+
 # Unsupported target "deflate" with type "test" omitted
+
 # Unsupported target "gzip" with type "test" omitted
+
 # Unsupported target "lzma" with type "test" omitted
+
 # Unsupported target "proptest" with type "test" omitted
+
 # Unsupported target "xz" with type "test" omitted
+
 # Unsupported target "zlib" with type "test" omitted
+
 # Unsupported target "zstd" with type "test" omitted
diff --git a/cargo/remote/atty-0.2.14.BUILD.bazel b/cargo/remote/BUILD.atty-0.2.14.bazel
similarity index 97%
rename from cargo/remote/atty-0.2.14.BUILD.bazel
rename to cargo/remote/BUILD.atty-0.2.14.bazel
index fe59c1d68..76d346625 100644
--- a/cargo/remote/atty-0.2.14.BUILD.bazel
+++ b/cargo/remote/BUILD.atty-0.2.14.bazel
@@ -28,13 +28,29 @@ licenses([
     "notice",  # MIT from expression "MIT"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "atty" with type "example" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "atty",
+    srcs = glob(["**/*.rs"]),
+    aliases = {
+    },
+    crate_features = [
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.2.14",
+    # buildifier: leave-alone
     deps = [
     ] + selects.with_or({
         # cfg(unix)
@@ -59,19 +75,4 @@ rust_library(
         ],
         "//conditions:default": [],
     }),
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.2.14",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-    ],
-    aliases = {
-    },
 )
diff --git a/cargo/remote/autocfg-1.0.1.BUILD.bazel b/cargo/remote/BUILD.autocfg-1.0.1.bazel
similarity index 95%
rename from cargo/remote/autocfg-1.0.1.BUILD.bazel
rename to cargo/remote/BUILD.autocfg-1.0.1.bazel
index b9d60c695..580d3acd8 100644
--- a/cargo/remote/autocfg-1.0.1.BUILD.bazel
+++ b/cargo/remote/BUILD.autocfg-1.0.1.bazel
@@ -28,30 +28,35 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0 OR MIT"
 ])
 
-# Generated targets
+# Generated Targets
+
+# Unsupported target "integers" with type "example" omitted
+
+# Unsupported target "paths" with type "example" omitted
+
+# Unsupported target "traits" with type "example" omitted
+
+# Unsupported target "versions" with type "example" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "autocfg",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "1.0.1",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "1.0.1",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
-# Unsupported target "integers" with type "example" omitted
-# Unsupported target "paths" with type "example" omitted
+
 # Unsupported target "rustflags" with type "test" omitted
-# Unsupported target "traits" with type "example" omitted
-# Unsupported target "versions" with type "example" omitted
diff --git a/cargo/remote/backtrace-0.3.54.BUILD.bazel b/cargo/remote/BUILD.backtrace-0.3.54.bazel
similarity index 97%
rename from cargo/remote/backtrace-0.3.54.BUILD.bazel
rename to cargo/remote/BUILD.backtrace-0.3.54.bazel
index d418e07f3..fa8be5d0b 100644
--- a/cargo/remote/backtrace-0.3.54.BUILD.bazel
+++ b/cargo/remote/BUILD.backtrace-0.3.54.bazel
@@ -28,14 +28,39 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# Unsupported target "accuracy" with type "test" omitted
+# Generated Targets
+
+# Unsupported target "benchmarks" with type "bench" omitted
+
 # Unsupported target "backtrace" with type "example" omitted
 
-# buildifier: leave-alone
+# Unsupported target "raw" with type "example" omitted
+
 rust_library(
     name = "backtrace",
+    srcs = glob(["**/*.rs"]),
+    aliases = {
+    },
+    crate_features = [
+        "addr2line",
+        "default",
+        "gimli-symbolize",
+        "miniz_oxide",
+        "object",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.3.54",
+    # buildifier: leave-alone
     deps = [
         "@raze__addr2line__0_14_0//:addr2line",
         "@raze__cfg_if__1_0_0//:cfg_if",
@@ -52,31 +77,14 @@ rust_library(
         ],
         "//conditions:default": [],
     }),
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.3.54",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-        "addr2line",
-        "default",
-        "gimli-symbolize",
-        "miniz_oxide",
-        "object",
-        "std",
-    ],
-    aliases = {
-    },
 )
-# Unsupported target "benchmarks" with type "bench" omitted
+
+# Unsupported target "accuracy" with type "test" omitted
+
 # Unsupported target "concurrent-panics" with type "test" omitted
+
 # Unsupported target "long_fn_name" with type "test" omitted
-# Unsupported target "raw" with type "example" omitted
+
 # Unsupported target "skip_inner_frames" with type "test" omitted
+
 # Unsupported target "smoke" with type "test" omitted
diff --git a/cargo/remote/base64-0.12.3.BUILD.bazel b/cargo/remote/BUILD.base64-0.12.3.bazel
similarity index 95%
rename from cargo/remote/base64-0.12.3.BUILD.bazel
rename to cargo/remote/BUILD.base64-0.12.3.bazel
index d3ff8a43c..0a2312eca 100644
--- a/cargo/remote/base64-0.12.3.BUILD.bazel
+++ b/cargo/remote/BUILD.base64-0.12.3.bazel
@@ -28,33 +28,39 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
+
+# Unsupported target "benchmarks" with type "bench" omitted
+
+# Unsupported target "make_tables" with type "example" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "base64",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.12.3",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "default",
         "std",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.12.3",
+    # buildifier: leave-alone
+    deps = [
+    ],
 )
-# Unsupported target "benchmarks" with type "bench" omitted
+
 # Unsupported target "decode" with type "test" omitted
+
 # Unsupported target "encode" with type "test" omitted
+
 # Unsupported target "helpers" with type "test" omitted
-# Unsupported target "make_tables" with type "example" omitted
+
 # Unsupported target "tests" with type "test" omitted
diff --git a/cargo/remote/base64-0.13.0.BUILD.bazel b/cargo/remote/BUILD.base64-0.13.0.bazel
similarity index 96%
rename from cargo/remote/base64-0.13.0.BUILD.bazel
rename to cargo/remote/BUILD.base64-0.13.0.bazel
index a2978e26e..77057688a 100644
--- a/cargo/remote/base64-0.13.0.BUILD.bazel
+++ b/cargo/remote/BUILD.base64-0.13.0.bazel
@@ -28,34 +28,41 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
+
+# Unsupported target "benchmarks" with type "bench" omitted
+
 # Unsupported target "base64" with type "example" omitted
 
-# buildifier: leave-alone
+# Unsupported target "make_tables" with type "example" omitted
+
 rust_library(
     name = "base64",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.13.0",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "default",
         "std",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.13.0",
+    # buildifier: leave-alone
+    deps = [
+    ],
 )
-# Unsupported target "benchmarks" with type "bench" omitted
+
 # Unsupported target "decode" with type "test" omitted
+
 # Unsupported target "encode" with type "test" omitted
+
 # Unsupported target "helpers" with type "test" omitted
-# Unsupported target "make_tables" with type "example" omitted
+
 # Unsupported target "tests" with type "test" omitted
diff --git a/cargo/remote/bitflags-1.2.1.BUILD.bazel b/cargo/remote/BUILD.bitflags-1.2.1.bazel
similarity index 92%
rename from cargo/remote/bitflags-1.2.1.BUILD.bazel
rename to cargo/remote/BUILD.bitflags-1.2.1.bazel
index 89c4d9072..8beb37d87 100644
--- a/cargo/remote/bitflags-1.2.1.BUILD.bazel
+++ b/cargo/remote/BUILD.bitflags-1.2.1.bazel
@@ -28,58 +28,55 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "bitflags_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build.rs",
-    edition = "2015",
-    deps = [
+    build_script_env = {
+    },
+    crate_features = [
+        "default",
     ],
+    crate_root = "build.rs",
+    data = glob(["**"]),
+    edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    crate_features = [
-      "default",
-    ],
-    build_script_env = {
-    },
-    data = glob(["**"]),
     tags = [
         "cargo-raze",
         "manual",
     ],
     version = "1.2.1",
     visibility = ["//visibility:private"],
+    deps = [
+    ],
 )
 
-
-# buildifier: leave-alone
 rust_library(
     name = "bitflags",
-    crate_type = "lib",
-    deps = [
-        ":bitflags_build_script",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "default",
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "1.2.1",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
-        "default",
+    version = "1.2.1",
+    # buildifier: leave-alone
+    deps = [
+        ":bitflags_build_script",
     ],
 )
diff --git a/cargo/remote/blake2b_simd-0.5.11.BUILD.bazel b/cargo/remote/BUILD.blake2b_simd-0.5.11.bazel
similarity index 95%
rename from cargo/remote/blake2b_simd-0.5.11.BUILD.bazel
rename to cargo/remote/BUILD.blake2b_simd-0.5.11.bazel
index 390ea5d9f..b47529cac 100644
--- a/cargo/remote/blake2b_simd-0.5.11.BUILD.bazel
+++ b/cargo/remote/BUILD.blake2b_simd-0.5.11.bazel
@@ -28,30 +28,30 @@ licenses([
     "notice",  # MIT from expression "MIT"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "blake2b_simd",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.5.11",
+    # buildifier: leave-alone
     deps = [
         "@raze__arrayref__0_3_6//:arrayref",
         "@raze__arrayvec__0_5_2//:arrayvec",
         "@raze__constant_time_eq__0_1_5//:constant_time_eq",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.5.11",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-        "default",
-        "std",
-    ],
 )
diff --git a/cargo/remote/blake3-0.3.7.BUILD.bazel b/cargo/remote/BUILD.blake3-0.3.7.bazel
similarity index 91%
rename from cargo/remote/blake3-0.3.7.BUILD.bazel
rename to cargo/remote/BUILD.blake3-0.3.7.bazel
index a3944992a..cfce76752 100644
--- a/cargo/remote/blake3-0.3.7.BUILD.bazel
+++ b/cargo/remote/BUILD.blake3-0.3.7.bazel
@@ -28,46 +28,59 @@ licenses([
     "unencumbered",  # CC0-1.0 from expression "CC0-1.0 OR Apache-2.0"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "blake3_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build.rs",
-    edition = "2018",
-    deps = [
-        "@raze__cc__1_0_61//:cc",
+    build_script_env = {
+    },
+    crate_features = [
+        "default",
+        "std",
     ],
+    crate_root = "build.rs",
+    data = glob(["**"]),
+    edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    crate_features = [
-      "default",
-      "std",
-    ],
-    build_script_env = {
-    },
-    data = glob(["**"]),
     tags = [
         "cargo-raze",
         "manual",
     ],
     version = "0.3.7",
     visibility = ["//visibility:private"],
+    deps = [
+        "@raze__cc__1_0_62//:cc",
+    ],
 )
 
 # Unsupported target "bench" with type "bench" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "blake3",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.3.7",
+    # buildifier: leave-alone
     deps = [
         ":blake3_build_script",
         "@raze__arrayref__0_3_6//:arrayref",
@@ -77,19 +90,4 @@ rust_library(
         "@raze__crypto_mac__0_8_0//:crypto_mac",
         "@raze__digest__0_9_0//:digest",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.3.7",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-        "default",
-        "std",
-    ],
 )
diff --git a/cargo/remote/bumpalo-3.4.0.BUILD.bazel b/cargo/remote/BUILD.bumpalo-3.4.0.bazel
similarity index 96%
rename from cargo/remote/bumpalo-3.4.0.BUILD.bazel
rename to cargo/remote/BUILD.bumpalo-3.4.0.bazel
index cc4837a3d..cd24af996 100644
--- a/cargo/remote/bumpalo-3.4.0.BUILD.bazel
+++ b/cargo/remote/BUILD.bumpalo-3.4.0.bazel
@@ -28,35 +28,44 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# Unsupported target "alloc_fill" with type "test" omitted
-# Unsupported target "alloc_with" with type "test" omitted
+# Generated Targets
+
 # Unsupported target "benches" with type "bench" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "bumpalo",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "default",
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "3.4.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
-        "default",
+    version = "3.4.0",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
+
+# Unsupported target "alloc_fill" with type "test" omitted
+
+# Unsupported target "alloc_with" with type "test" omitted
+
 # Unsupported target "quickchecks" with type "test" omitted
+
 # Unsupported target "readme_up_to_date" with type "test" omitted
+
 # Unsupported target "string" with type "test" omitted
+
 # Unsupported target "tests" with type "test" omitted
+
 # Unsupported target "try_alloc" with type "test" omitted
+
 # Unsupported target "vec" with type "test" omitted
diff --git a/cargo/remote/byteorder-1.3.4.BUILD.bazel b/cargo/remote/BUILD.byteorder-1.3.4.bazel
similarity index 92%
rename from cargo/remote/byteorder-1.3.4.BUILD.bazel
rename to cargo/remote/BUILD.byteorder-1.3.4.bazel
index 37fc73698..234aff448 100644
--- a/cargo/remote/byteorder-1.3.4.BUILD.bazel
+++ b/cargo/remote/BUILD.byteorder-1.3.4.bazel
@@ -28,61 +28,59 @@ licenses([
     "unencumbered",  # Unlicense from expression "Unlicense OR MIT"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "byteorder_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build.rs",
-    edition = "2015",
-    deps = [
+    build_script_env = {
+    },
+    crate_features = [
+        "default",
+        "std",
     ],
+    crate_root = "build.rs",
+    data = glob(["**"]),
+    edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    crate_features = [
-      "default",
-      "std",
-    ],
-    build_script_env = {
-    },
-    data = glob(["**"]),
     tags = [
         "cargo-raze",
         "manual",
     ],
     version = "1.3.4",
     visibility = ["//visibility:private"],
+    deps = [
+    ],
 )
 
 # Unsupported target "bench" with type "bench" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "byteorder",
-    crate_type = "lib",
-    deps = [
-        ":byteorder_build_script",
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "1.3.4",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "default",
         "std",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "1.3.4",
+    # buildifier: leave-alone
+    deps = [
+        ":byteorder_build_script",
+    ],
 )
diff --git a/cargo/remote/bytes-0.4.12.BUILD.bazel b/cargo/remote/BUILD.bytes-0.4.12.bazel
similarity index 96%
rename from cargo/remote/bytes-0.4.12.BUILD.bazel
rename to cargo/remote/BUILD.bytes-0.4.12.bazel
index 98b1053ca..fa8e97864 100644
--- a/cargo/remote/bytes-0.4.12.BUILD.bazel
+++ b/cargo/remote/BUILD.bytes-0.4.12.bazel
@@ -28,38 +28,49 @@ licenses([
     "notice",  # MIT from expression "MIT"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "bytes" with type "bench" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "bytes",
-    crate_type = "lib",
-    deps = [
-        "@raze__byteorder__1_3_4//:byteorder",
-        "@raze__iovec__0_1_4//:iovec",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.4.12",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.4.12",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__byteorder__1_3_4//:byteorder",
+        "@raze__iovec__0_1_4//:iovec",
     ],
 )
+
 # Unsupported target "test_buf" with type "test" omitted
+
 # Unsupported target "test_buf_mut" with type "test" omitted
+
 # Unsupported target "test_bytes" with type "test" omitted
+
 # Unsupported target "test_chain" with type "test" omitted
+
 # Unsupported target "test_debug" with type "test" omitted
+
 # Unsupported target "test_from_buf" with type "test" omitted
+
 # Unsupported target "test_iter" with type "test" omitted
+
 # Unsupported target "test_reader" with type "test" omitted
+
 # Unsupported target "test_serde" with type "test" omitted
+
 # Unsupported target "test_take" with type "test" omitted
diff --git a/cargo/remote/bytes-0.5.6.BUILD.bazel b/cargo/remote/BUILD.bytes-0.5.6.bazel
similarity index 96%
rename from cargo/remote/bytes-0.5.6.BUILD.bazel
rename to cargo/remote/BUILD.bytes-0.5.6.bazel
index 7ceeb84f1..604a1eeaa 100644
--- a/cargo/remote/bytes-0.5.6.BUILD.bazel
+++ b/cargo/remote/BUILD.bytes-0.5.6.bazel
@@ -28,41 +28,55 @@ licenses([
     "notice",  # MIT from expression "MIT"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "buf" with type "bench" omitted
+
 # Unsupported target "bytes" with type "bench" omitted
 
-# buildifier: leave-alone
+# Unsupported target "bytes_mut" with type "bench" omitted
+
 rust_library(
     name = "bytes",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.5.6",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "default",
         "std",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.5.6",
+    # buildifier: leave-alone
+    deps = [
+    ],
 )
-# Unsupported target "bytes_mut" with type "bench" omitted
+
 # Unsupported target "test_buf" with type "test" omitted
+
 # Unsupported target "test_buf_mut" with type "test" omitted
+
 # Unsupported target "test_bytes" with type "test" omitted
+
 # Unsupported target "test_bytes_odd_alloc" with type "test" omitted
+
 # Unsupported target "test_bytes_vec_alloc" with type "test" omitted
+
 # Unsupported target "test_chain" with type "test" omitted
+
 # Unsupported target "test_debug" with type "test" omitted
+
 # Unsupported target "test_iter" with type "test" omitted
+
 # Unsupported target "test_reader" with type "test" omitted
+
 # Unsupported target "test_serde" with type "test" omitted
+
 # Unsupported target "test_take" with type "test" omitted
diff --git a/cargo/remote/cc-1.0.61.BUILD.bazel b/cargo/remote/BUILD.cc-1.0.62.bazel
similarity index 92%
rename from cargo/remote/cc-1.0.61.BUILD.bazel
rename to cargo/remote/BUILD.cc-1.0.62.bazel
index 37401f502..a110ba198 100644
--- a/cargo/remote/cc-1.0.61.BUILD.bazel
+++ b/cargo/remote/BUILD.cc-1.0.62.bazel
@@ -28,53 +28,57 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
-rust_library(
-    name = "cc",
-    crate_type = "lib",
-    deps = [
-    ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "1.0.61",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-    ],
-)
-# Unsupported target "cc_env" with type "test" omitted
-# Unsupported target "cflags" with type "test" omitted
-# Unsupported target "cxxflags" with type "test" omitted
-
-# buildifier: leave-alone
 rust_binary(
     # Prefix bin name to disambiguate from (probable) collision with lib name
     # N.B.: The exact form of this is subject to change.
     name = "cargo_bin_gcc_shim",
-    deps = [
-        # Binaries get an implicit dependency on their crate's lib
-        ":cc",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/bin/gcc-shim.rs",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "1.0.61",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "1.0.62",
+    # buildifier: leave-alone
+    deps = [
+        # Binaries get an implicit dependency on their crate's lib
+        ":cc",
     ],
 )
+
+rust_library(
+    name = "cc",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "1.0.62",
+    # buildifier: leave-alone
+    deps = [
+    ],
+)
+
+# Unsupported target "cc_env" with type "test" omitted
+
+# Unsupported target "cflags" with type "test" omitted
+
+# Unsupported target "cxxflags" with type "test" omitted
+
 # Unsupported target "test" with type "test" omitted
diff --git a/cargo/remote/cfg-if-0.1.10.BUILD.bazel b/cargo/remote/BUILD.cfg-if-0.1.10.bazel
similarity index 95%
rename from cargo/remote/cfg-if-0.1.10.BUILD.bazel
rename to cargo/remote/BUILD.cfg-if-0.1.10.bazel
index 747af181a..f43387d0c 100644
--- a/cargo/remote/cfg-if-0.1.10.BUILD.bazel
+++ b/cargo/remote/BUILD.cfg-if-0.1.10.bazel
@@ -28,26 +28,27 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "cfg_if",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.1.10",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.1.10",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
+
 # Unsupported target "xcrate" with type "test" omitted
diff --git a/cargo/remote/cfg-if-1.0.0.BUILD.bazel b/cargo/remote/BUILD.cfg-if-1.0.0.bazel
similarity index 95%
rename from cargo/remote/cfg-if-1.0.0.BUILD.bazel
rename to cargo/remote/BUILD.cfg-if-1.0.0.bazel
index bda140871..62e4572b3 100644
--- a/cargo/remote/cfg-if-1.0.0.BUILD.bazel
+++ b/cargo/remote/BUILD.cfg-if-1.0.0.bazel
@@ -28,26 +28,27 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "cfg_if",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "1.0.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "1.0.0",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
+
 # Unsupported target "xcrate" with type "test" omitted
diff --git a/cargo/remote/chrono-0.4.19.BUILD.bazel b/cargo/remote/BUILD.chrono-0.4.19.bazel
similarity index 97%
rename from cargo/remote/chrono-0.4.19.BUILD.bazel
rename to cargo/remote/BUILD.chrono-0.4.19.bazel
index 6e24ee047..993c470f4 100644
--- a/cargo/remote/chrono-0.4.19.BUILD.bazel
+++ b/cargo/remote/BUILD.chrono-0.4.19.bazel
@@ -28,13 +28,38 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "chrono" with type "bench" omitted
 
-# buildifier: leave-alone
+# Unsupported target "serde" with type "bench" omitted
+
 rust_library(
     name = "chrono",
+    srcs = glob(["**/*.rs"]),
+    aliases = {
+    },
+    crate_features = [
+        "clock",
+        "default",
+        "libc",
+        "oldtime",
+        "std",
+        "time",
+        "winapi",
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.4.19",
+    # buildifier: leave-alone
     deps = [
         "@raze__libc__0_2_80//:libc",
         "@raze__num_integer__0_1_44//:num_integer",
@@ -50,28 +75,6 @@ rust_library(
         ],
         "//conditions:default": [],
     }),
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.4.19",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-        "clock",
-        "default",
-        "libc",
-        "oldtime",
-        "std",
-        "time",
-        "winapi",
-    ],
-    aliases = {
-    },
 )
-# Unsupported target "serde" with type "bench" omitted
+
 # Unsupported target "wasm" with type "test" omitted
diff --git a/cargo/remote/cloudabi-0.1.0.BUILD.bazel b/cargo/remote/BUILD.cloudabi-0.1.0.bazel
similarity index 95%
rename from cargo/remote/cloudabi-0.1.0.BUILD.bazel
rename to cargo/remote/BUILD.cloudabi-0.1.0.bazel
index 1441d5553..a99bf11f0 100644
--- a/cargo/remote/cloudabi-0.1.0.BUILD.bazel
+++ b/cargo/remote/BUILD.cloudabi-0.1.0.bazel
@@ -28,28 +28,28 @@ licenses([
     "restricted",  # BSD-2-Clause from expression "BSD-2-Clause"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "cloudabi",
-    crate_type = "lib",
-    deps = [
-        "@raze__bitflags__1_2_1//:bitflags",
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "cloudabi.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.1.0",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "bitflags",
         "default",
     ],
+    crate_root = "cloudabi.rs",
+    crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.1.0",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__bitflags__1_2_1//:bitflags",
+    ],
 )
diff --git a/cargo/remote/BUILD.coarsetime-0.1.14.bazel b/cargo/remote/BUILD.coarsetime-0.1.14.bazel
new file mode 100644
index 000000000..7f2692e72
--- /dev/null
+++ b/cargo/remote/BUILD.coarsetime-0.1.14.bazel
@@ -0,0 +1,70 @@
+"""
+@generated
+cargo-raze crate build file.
+
+DO NOT EDIT! Replaced on runs of cargo-raze
+"""
+
+# buildifier: disable=load
+load(
+    "@io_bazel_rules_rust//rust:rust.bzl",
+    "rust_binary",
+    "rust_library",
+    "rust_test",
+)
+
+# buildifier: disable=load
+load("@bazel_skylib//lib:selects.bzl", "selects")
+
+package(default_visibility = [
+    # Public for visibility by "@raze__crate__version//" targets.
+    #
+    # Prefer access through "//cargo", which limits external
+    # visibility to explicit Cargo.toml dependencies.
+    "//visibility:public",
+])
+
+licenses([
+    "notice",  # ISC from expression "ISC"
+])
+
+# Generated Targets
+
+rust_library(
+    name = "coarsetime",
+    srcs = glob(["**/*.rs"]),
+    aliases = {
+    },
+    crate_features = [
+    ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.1.14",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__lazy_static__1_4_0//:lazy_static",
+    ] + selects.with_or({
+        # cfg(not(target_os = "wasi"))
+        (
+            "@io_bazel_rules_rust//rust/platform:aarch64-apple-ios",
+            "@io_bazel_rules_rust//rust/platform:i686-apple-darwin",
+            "@io_bazel_rules_rust//rust/platform:i686-pc-windows-msvc",
+            "@io_bazel_rules_rust//rust/platform:i686-unknown-linux-gnu",
+            "@io_bazel_rules_rust//rust/platform:x86_64-apple-darwin",
+            "@io_bazel_rules_rust//rust/platform:x86_64-apple-ios",
+            "@io_bazel_rules_rust//rust/platform:x86_64-pc-windows-msvc",
+            "@io_bazel_rules_rust//rust/platform:x86_64-unknown-linux-gnu",
+        ): [
+            "@raze__libc__0_2_80//:libc",
+        ],
+        "//conditions:default": [],
+    }),
+)
diff --git a/cargo/remote/constant_time_eq-0.1.5.BUILD.bazel b/cargo/remote/BUILD.constant_time_eq-0.1.5.bazel
similarity index 95%
rename from cargo/remote/constant_time_eq-0.1.5.BUILD.bazel
rename to cargo/remote/BUILD.constant_time_eq-0.1.5.bazel
index f779ebdf0..1210d64a3 100644
--- a/cargo/remote/constant_time_eq-0.1.5.BUILD.bazel
+++ b/cargo/remote/BUILD.constant_time_eq-0.1.5.bazel
@@ -28,26 +28,27 @@ licenses([
     "unencumbered",  # CC0-1.0 from expression "CC0-1.0"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "bench" with type "bench" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "constant_time_eq",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.1.5",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.1.5",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
diff --git a/cargo/remote/core-foundation-0.7.0.BUILD.bazel b/cargo/remote/BUILD.core-foundation-0.7.0.bazel
similarity index 95%
rename from cargo/remote/core-foundation-0.7.0.BUILD.bazel
rename to cargo/remote/BUILD.core-foundation-0.7.0.bazel
index 38abcea78..b50d5e610 100644
--- a/cargo/remote/core-foundation-0.7.0.BUILD.bazel
+++ b/cargo/remote/BUILD.core-foundation-0.7.0.bazel
@@ -28,28 +28,29 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "core_foundation",
-    crate_type = "lib",
-    deps = [
-        "@raze__core_foundation_sys__0_7_0//:core_foundation_sys",
-        "@raze__libc__0_2_80//:libc",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.7.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.7.0",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__core_foundation_sys__0_7_0//:core_foundation_sys",
+        "@raze__libc__0_2_80//:libc",
     ],
 )
+
 # Unsupported target "use_macro_outside_crate" with type "test" omitted
diff --git a/cargo/remote/core-foundation-sys-0.7.0.BUILD.bazel b/cargo/remote/BUILD.core-foundation-sys-0.7.0.bazel
similarity index 93%
rename from cargo/remote/core-foundation-sys-0.7.0.BUILD.bazel
rename to cargo/remote/BUILD.core-foundation-sys-0.7.0.bazel
index d8f3297e6..38e5113fd 100644
--- a/cargo/remote/core-foundation-sys-0.7.0.BUILD.bazel
+++ b/cargo/remote/BUILD.core-foundation-sys-0.7.0.bazel
@@ -28,56 +28,53 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "core_foundation_sys_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build.rs",
-    edition = "2015",
-    deps = [
+    build_script_env = {
+    },
+    crate_features = [
     ],
+    crate_root = "build.rs",
+    data = glob(["**"]),
+    edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    crate_features = [
-    ],
-    build_script_env = {
-    },
-    data = glob(["**"]),
     tags = [
         "cargo-raze",
         "manual",
     ],
     version = "0.7.0",
     visibility = ["//visibility:private"],
+    deps = [
+    ],
 )
 
-
-# buildifier: leave-alone
 rust_library(
     name = "core_foundation_sys",
-    crate_type = "lib",
-    deps = [
-        ":core_foundation_sys_build_script",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.7.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.7.0",
+    # buildifier: leave-alone
+    deps = [
+        ":core_foundation_sys_build_script",
     ],
 )
diff --git a/cargo/remote/crc32fast-1.2.1.BUILD.bazel b/cargo/remote/BUILD.crc32fast-1.2.1.bazel
similarity index 92%
rename from cargo/remote/crc32fast-1.2.1.BUILD.bazel
rename to cargo/remote/BUILD.crc32fast-1.2.1.bazel
index 8a2063774..18435e851 100644
--- a/cargo/remote/crc32fast-1.2.1.BUILD.bazel
+++ b/cargo/remote/BUILD.crc32fast-1.2.1.bazel
@@ -28,62 +28,60 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "crc32fast_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build.rs",
-    edition = "2015",
-    deps = [
+    build_script_env = {
+    },
+    crate_features = [
+        "default",
+        "std",
     ],
+    crate_root = "build.rs",
+    data = glob(["**"]),
+    edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    crate_features = [
-      "default",
-      "std",
-    ],
-    build_script_env = {
-    },
-    data = glob(["**"]),
     tags = [
         "cargo-raze",
         "manual",
     ],
     version = "1.2.1",
     visibility = ["//visibility:private"],
+    deps = [
+    ],
 )
 
 # Unsupported target "bench" with type "bench" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "crc32fast",
-    crate_type = "lib",
-    deps = [
-        ":crc32fast_build_script",
-        "@raze__cfg_if__1_0_0//:cfg_if",
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "1.2.1",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "default",
         "std",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "1.2.1",
+    # buildifier: leave-alone
+    deps = [
+        ":crc32fast_build_script",
+        "@raze__cfg_if__1_0_0//:cfg_if",
+    ],
 )
diff --git a/cargo/remote/crossbeam-channel-0.4.4.BUILD.bazel b/cargo/remote/BUILD.crossbeam-channel-0.4.4.bazel
similarity index 96%
rename from cargo/remote/crossbeam-channel-0.4.4.BUILD.bazel
rename to cargo/remote/BUILD.crossbeam-channel-0.4.4.bazel
index 074af545d..cc561b29e 100644
--- a/cargo/remote/crossbeam-channel-0.4.4.BUILD.bazel
+++ b/cargo/remote/BUILD.crossbeam-channel-0.4.4.bazel
@@ -28,45 +28,63 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# Unsupported target "after" with type "test" omitted
-# Unsupported target "array" with type "test" omitted
+# Generated Targets
+
 # Unsupported target "crossbeam" with type "bench" omitted
 
-# buildifier: leave-alone
+# Unsupported target "fibonacci" with type "example" omitted
+
+# Unsupported target "matching" with type "example" omitted
+
+# Unsupported target "stopwatch" with type "example" omitted
+
 rust_library(
     name = "crossbeam_channel",
-    crate_type = "lib",
-    deps = [
-        "@raze__crossbeam_utils__0_7_2//:crossbeam_utils",
-        "@raze__maybe_uninit__2_0_0//:maybe_uninit",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.4.4",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.4.4",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__crossbeam_utils__0_7_2//:crossbeam_utils",
+        "@raze__maybe_uninit__2_0_0//:maybe_uninit",
     ],
 )
-# Unsupported target "fibonacci" with type "example" omitted
+
+# Unsupported target "after" with type "test" omitted
+
+# Unsupported target "array" with type "test" omitted
+
 # Unsupported target "golang" with type "test" omitted
+
 # Unsupported target "iter" with type "test" omitted
+
 # Unsupported target "list" with type "test" omitted
-# Unsupported target "matching" with type "example" omitted
+
 # Unsupported target "mpsc" with type "test" omitted
+
 # Unsupported target "never" with type "test" omitted
+
 # Unsupported target "ready" with type "test" omitted
+
 # Unsupported target "same_channel" with type "test" omitted
+
 # Unsupported target "select" with type "test" omitted
+
 # Unsupported target "select_macro" with type "test" omitted
-# Unsupported target "stopwatch" with type "example" omitted
+
 # Unsupported target "thread_locals" with type "test" omitted
+
 # Unsupported target "tick" with type "test" omitted
+
 # Unsupported target "zero" with type "test" omitted
diff --git a/cargo/remote/crossbeam-utils-0.7.2.BUILD.bazel b/cargo/remote/BUILD.crossbeam-utils-0.7.2.bazel
similarity index 93%
rename from cargo/remote/crossbeam-utils-0.7.2.BUILD.bazel
rename to cargo/remote/BUILD.crossbeam-utils-0.7.2.bazel
index 24f8f5990..72476dd43 100644
--- a/cargo/remote/crossbeam-utils-0.7.2.BUILD.bazel
+++ b/cargo/remote/BUILD.crossbeam-utils-0.7.2.bazel
@@ -28,72 +28,76 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "crossbeam_utils_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build.rs",
-    edition = "2015",
-    deps = [
-        "@raze__autocfg__1_0_1//:autocfg",
+    build_script_env = {
+    },
+    crate_features = [
+        "default",
+        "lazy_static",
+        "std",
     ],
+    crate_root = "build.rs",
+    data = glob(["**"]),
+    edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    crate_features = [
-      "default",
-      "lazy_static",
-      "std",
-    ],
-    build_script_env = {
-    },
-    data = glob(["**"]),
     tags = [
         "cargo-raze",
         "manual",
     ],
     version = "0.7.2",
     visibility = ["//visibility:private"],
+    deps = [
+        "@raze__autocfg__1_0_1//:autocfg",
+    ],
 )
 
 # Unsupported target "atomic_cell" with type "bench" omitted
-# Unsupported target "atomic_cell" with type "test" omitted
-# Unsupported target "cache_padded" with type "test" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "crossbeam_utils",
-    crate_type = "lib",
-    deps = [
-        ":crossbeam_utils_build_script",
-        "@raze__cfg_if__0_1_10//:cfg_if",
-        "@raze__lazy_static__1_4_0//:lazy_static",
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.7.2",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "default",
         "lazy_static",
         "std",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.7.2",
+    # buildifier: leave-alone
+    deps = [
+        ":crossbeam_utils_build_script",
+        "@raze__cfg_if__0_1_10//:cfg_if",
+        "@raze__lazy_static__1_4_0//:lazy_static",
+    ],
 )
+
+# Unsupported target "atomic_cell" with type "test" omitted
+
+# Unsupported target "cache_padded" with type "test" omitted
+
 # Unsupported target "parker" with type "test" omitted
+
 # Unsupported target "sharded_lock" with type "test" omitted
+
 # Unsupported target "thread" with type "test" omitted
+
 # Unsupported target "wait_group" with type "test" omitted
diff --git a/cargo/remote/crypto-mac-0.8.0.BUILD.bazel b/cargo/remote/BUILD.crypto-mac-0.8.0.bazel
similarity index 95%
rename from cargo/remote/crypto-mac-0.8.0.BUILD.bazel
rename to cargo/remote/BUILD.crypto-mac-0.8.0.bazel
index 93334616e..ff20f1c8d 100644
--- a/cargo/remote/crypto-mac-0.8.0.BUILD.bazel
+++ b/cargo/remote/BUILD.crypto-mac-0.8.0.bazel
@@ -28,27 +28,27 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "crypto_mac",
-    crate_type = "lib",
-    deps = [
-        "@raze__generic_array__0_14_4//:generic_array",
-        "@raze__subtle__2_3_0//:subtle",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.8.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.8.0",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__generic_array__0_14_4//:generic_array",
+        "@raze__subtle__2_3_0//:subtle",
     ],
 )
diff --git a/cargo/remote/ctor-0.1.16.BUILD.bazel b/cargo/remote/BUILD.ctor-0.1.16.bazel
similarity index 95%
rename from cargo/remote/ctor-0.1.16.BUILD.bazel
rename to cargo/remote/BUILD.ctor-0.1.16.bazel
index 296af1150..cfcb49eb0 100644
--- a/cargo/remote/ctor-0.1.16.BUILD.bazel
+++ b/cargo/remote/BUILD.ctor-0.1.16.bazel
@@ -28,28 +28,29 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0 OR MIT"
 ])
 
-# Generated targets
+# Generated Targets
+
+# Unsupported target "example" with type "example" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "ctor",
-    crate_type = "proc-macro",
-    deps = [
-        "@raze__quote__1_0_7//:quote",
-        "@raze__syn__1_0_48//:syn",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "proc-macro",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.1.16",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.1.16",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__quote__1_0_7//:quote",
+        "@raze__syn__1_0_48//:syn",
     ],
 )
-# Unsupported target "example" with type "example" omitted
diff --git a/cargo/remote/derivative-2.1.1.BUILD.bazel b/cargo/remote/BUILD.derivative-2.1.1.bazel
similarity index 98%
rename from cargo/remote/derivative-2.1.1.BUILD.bazel
rename to cargo/remote/BUILD.derivative-2.1.1.bazel
index 7a8a79fcc..1d8c8586b 100644
--- a/cargo/remote/derivative-2.1.1.BUILD.bazel
+++ b/cargo/remote/BUILD.derivative-2.1.1.bazel
@@ -28,95 +28,161 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# Unsupported target "compile-test" with type "test" omitted
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "derivative",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "use_core",
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "proc-macro",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "2.1.1",
+    # buildifier: leave-alone
     deps = [
         "@raze__proc_macro2__1_0_24//:proc_macro2",
         "@raze__quote__1_0_7//:quote",
         "@raze__syn__1_0_48//:syn",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "2.1.1",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-        "use_core",
-    ],
 )
+
+# Unsupported target "compile-test" with type "test" omitted
+
 # Unsupported target "derive-clone" with type "test" omitted
+
 # Unsupported target "derive-clone-generics" with type "test" omitted
+
 # Unsupported target "derive-debug" with type "test" omitted
+
 # Unsupported target "derive-debug-bounds" with type "test" omitted
+
 # Unsupported target "derive-debug-generics" with type "test" omitted
+
 # Unsupported target "derive-debug-transparent" with type "test" omitted
+
 # Unsupported target "derive-default" with type "test" omitted
+
 # Unsupported target "derive-default-bounds" with type "test" omitted
+
 # Unsupported target "derive-eq" with type "test" omitted
+
 # Unsupported target "derive-hash" with type "test" omitted
+
 # Unsupported target "derive-ord" with type "test" omitted
+
 # Unsupported target "derive-partial-eq" with type "test" omitted
+
 # Unsupported target "issue-37-turbofish" with type "test" omitted
+
 # Unsupported target "issue-55" with type "test" omitted
+
 # Unsupported target "issue-57" with type "test" omitted
+
 # Unsupported target "issue-58" with type "test" omitted
+
 # Unsupported target "issue-67" with type "test" omitted
+
 # Unsupported target "rustc-class-implement-traits" with type "test" omitted
+
 # Unsupported target "rustc-deriving-bounds" with type "test" omitted
+
 # Unsupported target "rustc-deriving-clone-array" with type "test" omitted
+
 # Unsupported target "rustc-deriving-clone-enum" with type "test" omitted
+
 # Unsupported target "rustc-deriving-clone-generic-enum" with type "test" omitted
+
 # Unsupported target "rustc-deriving-clone-generic-tuple-struct" with type "test" omitted
+
 # Unsupported target "rustc-deriving-clone-struct" with type "test" omitted
+
 # Unsupported target "rustc-deriving-clone-tuple-struct" with type "test" omitted
+
 # Unsupported target "rustc-deriving-cmp-generic-enum" with type "test" omitted
+
 # Unsupported target "rustc-deriving-cmp-generic-struct" with type "test" omitted
+
 # Unsupported target "rustc-deriving-cmp-generic-struct-enum" with type "test" omitted
+
 # Unsupported target "rustc-deriving-cmp-generic-tuple-struct" with type "test" omitted
+
 # Unsupported target "rustc-deriving-copyclone" with type "test" omitted
+
 # Unsupported target "rustc-deriving-default-box" with type "test" omitted
+
 # Unsupported target "rustc-deriving-enum-single-variant" with type "test" omitted
+
 # Unsupported target "rustc-deriving-hash" with type "test" omitted
+
 # Unsupported target "rustc-deriving-in-fn" with type "test" omitted
+
 # Unsupported target "rustc-deriving-meta" with type "test" omitted
+
 # Unsupported target "rustc-deriving-meta-multiple" with type "test" omitted
+
 # Unsupported target "rustc-deriving-show" with type "test" omitted
+
 # Unsupported target "rustc-deriving-show-2" with type "test" omitted
+
 # Unsupported target "rustc-deriving-via-extension-hash-enum" with type "test" omitted
+
 # Unsupported target "rustc-deriving-via-extension-hash-struct" with type "test" omitted
+
 # Unsupported target "rustc-deriving-via-extension-type-params" with type "test" omitted
+
 # Unsupported target "rustc-expr-copy" with type "test" omitted
+
 # Unsupported target "rustc-exterior" with type "test" omitted
+
 # Unsupported target "rustc-issue-12860" with type "test" omitted
+
 # Unsupported target "rustc-issue-13434" with type "test" omitted
+
 # Unsupported target "rustc-issue-16530" with type "test" omitted
+
 # Unsupported target "rustc-issue-19037" with type "test" omitted
+
 # Unsupported target "rustc-issue-19102" with type "test" omitted
+
 # Unsupported target "rustc-issue-19135" with type "test" omitted
+
 # Unsupported target "rustc-issue-19358" with type "test" omitted
+
 # Unsupported target "rustc-issue-21402" with type "test" omitted
+
 # Unsupported target "rustc-issue-23649-3" with type "test" omitted
+
 # Unsupported target "rustc-issue-24085" with type "test" omitted
+
 # Unsupported target "rustc-issue-25394" with type "test" omitted
+
 # Unsupported target "rustc-issue-28561" with type "test" omitted
+
 # Unsupported target "rustc-issue-29030" with type "test" omitted
+
 # Unsupported target "rustc-issue-29540" with type "test" omitted
+
 # Unsupported target "rustc-issue-29710" with type "test" omitted
+
 # Unsupported target "rustc-issue-32292" with type "test" omitted
+
 # Unsupported target "rustc-issue-3935" with type "test" omitted
+
 # Unsupported target "rustc-issue-42453" with type "test" omitted
+
 # Unsupported target "rustc-issue-58319" with type "test" omitted
+
 # Unsupported target "rustc-issue-6341" with type "test" omitted
+
 # Unsupported target "rustc-typeclasses-eq-example" with type "test" omitted
+
 # Unsupported target "rustc-zero-sized-btreemap-insert" with type "test" omitted
diff --git a/cargo/remote/digest-0.9.0.BUILD.bazel b/cargo/remote/BUILD.digest-0.9.0.bazel
similarity index 95%
rename from cargo/remote/digest-0.9.0.BUILD.bazel
rename to cargo/remote/BUILD.digest-0.9.0.bazel
index 341c7d4dc..b733989b4 100644
--- a/cargo/remote/digest-0.9.0.BUILD.bazel
+++ b/cargo/remote/BUILD.digest-0.9.0.bazel
@@ -28,28 +28,28 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "digest",
-    crate_type = "lib",
-    deps = [
-        "@raze__generic_array__0_14_4//:generic_array",
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.9.0",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "alloc",
         "std",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.9.0",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__generic_array__0_14_4//:generic_array",
+    ],
 )
diff --git a/cargo/remote/dirs-2.0.2.BUILD.bazel b/cargo/remote/BUILD.dirs-2.0.2.bazel
similarity index 95%
rename from cargo/remote/dirs-2.0.2.BUILD.bazel
rename to cargo/remote/BUILD.dirs-2.0.2.bazel
index 2ed03a920..29b696a90 100644
--- a/cargo/remote/dirs-2.0.2.BUILD.bazel
+++ b/cargo/remote/BUILD.dirs-2.0.2.bazel
@@ -28,27 +28,27 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "dirs",
-    crate_type = "lib",
-    deps = [
-        "@raze__cfg_if__0_1_10//:cfg_if",
-        "@raze__dirs_sys__0_3_5//:dirs_sys",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "2.0.2",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "2.0.2",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__cfg_if__0_1_10//:cfg_if",
+        "@raze__dirs_sys__0_3_5//:dirs_sys",
     ],
 )
diff --git a/cargo/remote/dirs-sys-0.3.5.BUILD.bazel b/cargo/remote/BUILD.dirs-sys-0.3.5.bazel
similarity index 97%
rename from cargo/remote/dirs-sys-0.3.5.BUILD.bazel
rename to cargo/remote/BUILD.dirs-sys-0.3.5.bazel
index b1e621cd3..ff03f0eab 100644
--- a/cargo/remote/dirs-sys-0.3.5.BUILD.bazel
+++ b/cargo/remote/BUILD.dirs-sys-0.3.5.bazel
@@ -28,12 +28,27 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "dirs_sys",
+    srcs = glob(["**/*.rs"]),
+    aliases = {
+    },
+    crate_features = [
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.3.5",
+    # buildifier: leave-alone
     deps = [
     ] + selects.with_or({
         # cfg(unix)
@@ -58,19 +73,4 @@ rust_library(
         ],
         "//conditions:default": [],
     }),
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.3.5",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-    ],
-    aliases = {
-    },
 )
diff --git a/cargo/remote/dtoa-0.4.6.BUILD.bazel b/cargo/remote/BUILD.dtoa-0.4.6.bazel
similarity index 95%
rename from cargo/remote/dtoa-0.4.6.BUILD.bazel
rename to cargo/remote/BUILD.dtoa-0.4.6.bazel
index 823226075..10f0c5e06 100644
--- a/cargo/remote/dtoa-0.4.6.BUILD.bazel
+++ b/cargo/remote/BUILD.dtoa-0.4.6.bazel
@@ -28,27 +28,29 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "bench" with type "bench" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "dtoa",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.4.6",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.4.6",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
+
 # Unsupported target "test" with type "test" omitted
diff --git a/cargo/remote/either-1.6.1.BUILD.bazel b/cargo/remote/BUILD.either-1.6.1.bazel
similarity index 95%
rename from cargo/remote/either-1.6.1.BUILD.bazel
rename to cargo/remote/BUILD.either-1.6.1.bazel
index 6b216ff52..05f1403fc 100644
--- a/cargo/remote/either-1.6.1.BUILD.bazel
+++ b/cargo/remote/BUILD.either-1.6.1.bazel
@@ -28,27 +28,27 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "either",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "1.6.1",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "default",
         "use_std",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "1.6.1",
+    # buildifier: leave-alone
+    deps = [
+    ],
 )
diff --git a/cargo/remote/encoding_rs-0.8.26.BUILD.bazel b/cargo/remote/BUILD.encoding_rs-0.8.26.bazel
similarity index 93%
rename from cargo/remote/encoding_rs-0.8.26.BUILD.bazel
rename to cargo/remote/BUILD.encoding_rs-0.8.26.bazel
index 105fdc917..941bba7bf 100644
--- a/cargo/remote/encoding_rs-0.8.26.BUILD.bazel
+++ b/cargo/remote/BUILD.encoding_rs-0.8.26.bazel
@@ -28,57 +28,54 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0 OR MIT"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "encoding_rs_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build.rs",
-    edition = "2018",
-    deps = [
+    build_script_env = {
+    },
+    crate_features = [
     ],
+    crate_root = "build.rs",
+    data = glob(["**"]),
+    edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    crate_features = [
-    ],
-    build_script_env = {
-    },
-    data = glob(["**"]),
     tags = [
         "cargo-raze",
         "manual",
     ],
     version = "0.8.26",
     visibility = ["//visibility:private"],
+    deps = [
+    ],
 )
 
-
-# buildifier: leave-alone
 rust_library(
     name = "encoding_rs",
-    crate_type = "lib",
-    deps = [
-        ":encoding_rs_build_script",
-        "@raze__cfg_if__1_0_0//:cfg_if",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.8.26",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.8.26",
+    # buildifier: leave-alone
+    deps = [
+        ":encoding_rs_build_script",
+        "@raze__cfg_if__1_0_0//:cfg_if",
     ],
 )
diff --git a/cargo/remote/env_logger-0.8.1.BUILD.bazel b/cargo/remote/BUILD.env_logger-0.8.1.bazel
similarity index 97%
rename from cargo/remote/env_logger-0.8.1.BUILD.bazel
rename to cargo/remote/BUILD.env_logger-0.8.1.bazel
index 09eb284ba..7f282627d 100644
--- a/cargo/remote/env_logger-0.8.1.BUILD.bazel
+++ b/cargo/remote/BUILD.env_logger-0.8.1.bazel
@@ -28,35 +28,27 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "custom_default_format" with type "example" omitted
+
 # Unsupported target "custom_format" with type "example" omitted
+
 # Unsupported target "custom_logger" with type "example" omitted
+
 # Unsupported target "default" with type "example" omitted
+
 # Unsupported target "direct_logger" with type "example" omitted
 
-# buildifier: leave-alone
+# Unsupported target "filters_from_code" with type "example" omitted
+
+# Unsupported target "in_tests" with type "example" omitted
+
+# Unsupported target "syslog_friendly_format" with type "example" omitted
+
 rust_library(
     name = "env_logger",
-    crate_type = "lib",
-    deps = [
-        "@raze__atty__0_2_14//:atty",
-        "@raze__humantime__2_0_1//:humantime",
-        "@raze__log__0_4_11//:log",
-        "@raze__regex__1_4_2//:regex",
-        "@raze__termcolor__1_1_0//:termcolor",
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.8.1",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "atty",
         "default",
@@ -64,11 +56,31 @@ rust_library(
         "regex",
         "termcolor",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.8.1",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__atty__0_2_14//:atty",
+        "@raze__humantime__2_0_1//:humantime",
+        "@raze__log__0_4_11//:log",
+        "@raze__regex__1_4_2//:regex",
+        "@raze__termcolor__1_1_0//:termcolor",
+    ],
 )
-# Unsupported target "filters_from_code" with type "example" omitted
-# Unsupported target "in_tests" with type "example" omitted
+
 # Unsupported target "init-twice-retains-filter" with type "test" omitted
+
 # Unsupported target "log-in-log" with type "test" omitted
+
 # Unsupported target "log_tls_dtors" with type "test" omitted
+
 # Unsupported target "regexp_filter" with type "test" omitted
-# Unsupported target "syslog_friendly_format" with type "example" omitted
diff --git a/cargo/remote/failure-0.1.8.BUILD.bazel b/cargo/remote/BUILD.failure-0.1.8.bazel
similarity index 96%
rename from cargo/remote/failure-0.1.8.BUILD.bazel
rename to cargo/remote/BUILD.failure-0.1.8.bazel
index 1ad75ee5b..2f9fa11a6 100644
--- a/cargo/remote/failure-0.1.8.BUILD.bazel
+++ b/cargo/remote/BUILD.failure-0.1.8.bazel
@@ -28,33 +28,19 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# Unsupported target "bail_ensure" with type "example" omitted
-# Unsupported target "basic_fail" with type "test" omitted
-# Unsupported target "error_as_cause" with type "example" omitted
-# Unsupported target "fail_compat" with type "test" omitted
+# Generated Targets
+
+# Unsupported target "bail_ensure" with type "example" omitted
+
+# Unsupported target "error_as_cause" with type "example" omitted
+
+# Unsupported target "simple" with type "example" omitted
+
+# Unsupported target "string_custom_error_pattern" with type "example" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "failure",
-    crate_type = "lib",
-    deps = [
-        "@raze__backtrace__0_3_54//:backtrace",
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    proc_macro_deps = [
-        "@raze__failure_derive__0_1_8//:failure_derive",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.1.8",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "backtrace",
         "default",
@@ -62,7 +48,28 @@ rust_library(
         "failure_derive",
         "std",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2015",
+    proc_macro_deps = [
+        "@raze__failure_derive__0_1_8//:failure_derive",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.1.8",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__backtrace__0_3_54//:backtrace",
+    ],
 )
+
+# Unsupported target "basic_fail" with type "test" omitted
+
+# Unsupported target "fail_compat" with type "test" omitted
+
 # Unsupported target "macro_trailing_comma" with type "test" omitted
-# Unsupported target "simple" with type "example" omitted
-# Unsupported target "string_custom_error_pattern" with type "example" omitted
diff --git a/cargo/remote/failure_derive-0.1.8.BUILD.bazel b/cargo/remote/BUILD.failure_derive-0.1.8.bazel
similarity index 95%
rename from cargo/remote/failure_derive-0.1.8.BUILD.bazel
rename to cargo/remote/BUILD.failure_derive-0.1.8.bazel
index 0711d248b..e5e124803 100644
--- a/cargo/remote/failure_derive-0.1.8.BUILD.bazel
+++ b/cargo/remote/BUILD.failure_derive-0.1.8.bazel
@@ -28,44 +28,52 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "failure_derive_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build.rs",
-    edition = "2015",
-    deps = [
+    build_script_env = {
+    },
+    crate_features = [
     ],
+    crate_root = "build.rs",
+    data = glob(["**"]),
+    edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    crate_features = [
-    ],
-    build_script_env = {
-    },
-    data = glob(["**"]),
     tags = [
         "cargo-raze",
         "manual",
     ],
     version = "0.1.8",
     visibility = ["//visibility:private"],
+    deps = [
+    ],
 )
 
-# Unsupported target "backtrace" with type "test" omitted
-# Unsupported target "custom_type_bounds" with type "test" omitted
-
-# buildifier: leave-alone
 rust_library(
     name = "failure_derive",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "proc-macro",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.1.8",
+    # buildifier: leave-alone
     deps = [
         ":failure_derive_build_script",
         "@raze__proc_macro2__1_0_24//:proc_macro2",
@@ -73,20 +81,14 @@ rust_library(
         "@raze__syn__1_0_48//:syn",
         "@raze__synstructure__0_12_4//:synstructure",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.1.8",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-    ],
 )
+
+# Unsupported target "backtrace" with type "test" omitted
+
+# Unsupported target "custom_type_bounds" with type "test" omitted
+
 # Unsupported target "no_derive_display" with type "test" omitted
+
 # Unsupported target "tests" with type "test" omitted
+
 # Unsupported target "wraps" with type "test" omitted
diff --git a/cargo/remote/fallible-iterator-0.2.0.BUILD.bazel b/cargo/remote/BUILD.fallible-iterator-0.2.0.bazel
similarity index 95%
rename from cargo/remote/fallible-iterator-0.2.0.BUILD.bazel
rename to cargo/remote/BUILD.fallible-iterator-0.2.0.bazel
index 9e2c46be9..489f3ee6b 100644
--- a/cargo/remote/fallible-iterator-0.2.0.BUILD.bazel
+++ b/cargo/remote/BUILD.fallible-iterator-0.2.0.bazel
@@ -28,27 +28,27 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "fallible_iterator",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.2.0",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "default",
         "std",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.2.0",
+    # buildifier: leave-alone
+    deps = [
+    ],
 )
diff --git a/cargo/remote/fallible-streaming-iterator-0.1.9.BUILD.bazel b/cargo/remote/BUILD.fallible-streaming-iterator-0.1.9.bazel
similarity index 95%
rename from cargo/remote/fallible-streaming-iterator-0.1.9.BUILD.bazel
rename to cargo/remote/BUILD.fallible-streaming-iterator-0.1.9.bazel
index 9c2e6f3d6..5ee47375f 100644
--- a/cargo/remote/fallible-streaming-iterator-0.1.9.BUILD.bazel
+++ b/cargo/remote/BUILD.fallible-streaming-iterator-0.1.9.bazel
@@ -28,25 +28,25 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "fallible_streaming_iterator",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.1.9",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.1.9",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
diff --git a/cargo/remote/fixedbitset-0.2.0.BUILD.bazel b/cargo/remote/BUILD.fixedbitset-0.2.0.bazel
similarity index 95%
rename from cargo/remote/fixedbitset-0.2.0.BUILD.bazel
rename to cargo/remote/BUILD.fixedbitset-0.2.0.bazel
index 64c19425f..5a1c1186e 100644
--- a/cargo/remote/fixedbitset-0.2.0.BUILD.bazel
+++ b/cargo/remote/BUILD.fixedbitset-0.2.0.bazel
@@ -28,26 +28,27 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "benches" with type "bench" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "fixedbitset",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.2.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.2.0",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
diff --git a/cargo/remote/flate2-1.0.19.BUILD.bazel b/cargo/remote/BUILD.flate2-1.0.19.bazel
similarity index 97%
rename from cargo/remote/flate2-1.0.19.BUILD.bazel
rename to cargo/remote/BUILD.flate2-1.0.19.bazel
index 44736e569..e923ce2e1 100644
--- a/cargo/remote/flate2-1.0.19.BUILD.bazel
+++ b/cargo/remote/BUILD.flate2-1.0.19.bazel
@@ -28,60 +28,88 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# Unsupported target "async-reader" with type "test" omitted
-# Unsupported target "compress_file" with type "example" omitted
-# Unsupported target "deflatedecoder-bufread" with type "example" omitted
-# Unsupported target "deflatedecoder-read" with type "example" omitted
-# Unsupported target "deflatedecoder-write" with type "example" omitted
-# Unsupported target "deflateencoder-bufread" with type "example" omitted
-# Unsupported target "deflateencoder-read" with type "example" omitted
-# Unsupported target "deflateencoder-write" with type "example" omitted
-# Unsupported target "early-flush" with type "test" omitted
-# Unsupported target "empty-read" with type "test" omitted
+# Generated Targets
+
+# Unsupported target "compress_file" with type "example" omitted
+
+# Unsupported target "deflatedecoder-bufread" with type "example" omitted
+
+# Unsupported target "deflatedecoder-read" with type "example" omitted
+
+# Unsupported target "deflatedecoder-write" with type "example" omitted
+
+# Unsupported target "deflateencoder-bufread" with type "example" omitted
+
+# Unsupported target "deflateencoder-read" with type "example" omitted
+
+# Unsupported target "deflateencoder-write" with type "example" omitted
+
+# Unsupported target "gzbuilder" with type "example" omitted
+
+# Unsupported target "gzdecoder-bufread" with type "example" omitted
+
+# Unsupported target "gzdecoder-read" with type "example" omitted
+
+# Unsupported target "gzdecoder-write" with type "example" omitted
+
+# Unsupported target "gzencoder-bufread" with type "example" omitted
+
+# Unsupported target "gzencoder-read" with type "example" omitted
+
+# Unsupported target "gzencoder-write" with type "example" omitted
+
+# Unsupported target "gzmultidecoder-bufread" with type "example" omitted
+
+# Unsupported target "gzmultidecoder-read" with type "example" omitted
+
+# Unsupported target "zlibdecoder-bufread" with type "example" omitted
+
+# Unsupported target "zlibdecoder-read" with type "example" omitted
+
+# Unsupported target "zlibdecoder-write" with type "example" omitted
+
+# Unsupported target "zlibencoder-bufread" with type "example" omitted
+
+# Unsupported target "zlibencoder-read" with type "example" omitted
+
+# Unsupported target "zlibencoder-write" with type "example" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "flate2",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "default",
+        "miniz_oxide",
+        "rust_backend",
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "1.0.19",
+    # buildifier: leave-alone
     deps = [
         "@raze__cfg_if__1_0_0//:cfg_if",
         "@raze__crc32fast__1_2_1//:crc32fast",
         "@raze__libc__0_2_80//:libc",
         "@raze__miniz_oxide__0_4_3//:miniz_oxide",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "1.0.19",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-        "default",
-        "miniz_oxide",
-        "rust_backend",
-    ],
 )
+
+# Unsupported target "async-reader" with type "test" omitted
+
+# Unsupported target "early-flush" with type "test" omitted
+
+# Unsupported target "empty-read" with type "test" omitted
+
 # Unsupported target "gunzip" with type "test" omitted
-# Unsupported target "gzbuilder" with type "example" omitted
-# Unsupported target "gzdecoder-bufread" with type "example" omitted
-# Unsupported target "gzdecoder-read" with type "example" omitted
-# Unsupported target "gzdecoder-write" with type "example" omitted
-# Unsupported target "gzencoder-bufread" with type "example" omitted
-# Unsupported target "gzencoder-read" with type "example" omitted
-# Unsupported target "gzencoder-write" with type "example" omitted
-# Unsupported target "gzmultidecoder-bufread" with type "example" omitted
-# Unsupported target "gzmultidecoder-read" with type "example" omitted
+
 # Unsupported target "tokio" with type "test" omitted
+
 # Unsupported target "zero-write" with type "test" omitted
-# Unsupported target "zlibdecoder-bufread" with type "example" omitted
-# Unsupported target "zlibdecoder-read" with type "example" omitted
-# Unsupported target "zlibdecoder-write" with type "example" omitted
-# Unsupported target "zlibencoder-bufread" with type "example" omitted
-# Unsupported target "zlibencoder-read" with type "example" omitted
-# Unsupported target "zlibencoder-write" with type "example" omitted
diff --git a/cargo/remote/fluent-0.13.1.BUILD.bazel b/cargo/remote/BUILD.fluent-0.13.1.bazel
similarity index 95%
rename from cargo/remote/fluent-0.13.1.BUILD.bazel
rename to cargo/remote/BUILD.fluent-0.13.1.bazel
index 181e4d70b..7608dc5e5 100644
--- a/cargo/remote/fluent-0.13.1.BUILD.bazel
+++ b/cargo/remote/BUILD.fluent-0.13.1.bazel
@@ -28,27 +28,27 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0 OR MIT"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "fluent",
-    crate_type = "lib",
-    deps = [
-        "@raze__fluent_bundle__0_13_1//:fluent_bundle",
-        "@raze__unic_langid__0_9_0//:unic_langid",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.13.1",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.13.1",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__fluent_bundle__0_13_1//:fluent_bundle",
+        "@raze__unic_langid__0_9_0//:unic_langid",
     ],
 )
diff --git a/cargo/remote/fluent-bundle-0.13.1.BUILD.bazel b/cargo/remote/BUILD.fluent-bundle-0.13.1.bazel
similarity index 96%
rename from cargo/remote/fluent-bundle-0.13.1.BUILD.bazel
rename to cargo/remote/BUILD.fluent-bundle-0.13.1.bazel
index 5a18a136a..015bc79b2 100644
--- a/cargo/remote/fluent-bundle-0.13.1.BUILD.bazel
+++ b/cargo/remote/BUILD.fluent-bundle-0.13.1.bazel
@@ -28,12 +28,27 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0 OR MIT"
 ])
 
-# Generated targets
+# Generated Targets
+
+# Unsupported target "resolver" with type "bench" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "fluent_bundle",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.13.1",
+    # buildifier: leave-alone
     deps = [
         "@raze__fluent_langneg__0_13_0//:fluent_langneg",
         "@raze__fluent_syntax__0_10_0//:fluent_syntax",
@@ -43,18 +58,4 @@ rust_library(
         "@raze__smallvec__1_4_2//:smallvec",
         "@raze__unic_langid__0_9_0//:unic_langid",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.13.1",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-    ],
 )
-# Unsupported target "resolver" with type "bench" omitted
diff --git a/cargo/remote/fluent-langneg-0.13.0.BUILD.bazel b/cargo/remote/BUILD.fluent-langneg-0.13.0.bazel
similarity index 95%
rename from cargo/remote/fluent-langneg-0.13.0.BUILD.bazel
rename to cargo/remote/BUILD.fluent-langneg-0.13.0.bazel
index 8c230e045..7bbc310ad 100644
--- a/cargo/remote/fluent-langneg-0.13.0.BUILD.bazel
+++ b/cargo/remote/BUILD.fluent-langneg-0.13.0.bazel
@@ -28,28 +28,29 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
+
+# Unsupported target "negotiate" with type "bench" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "fluent_langneg",
-    crate_type = "lib",
-    deps = [
-        "@raze__unic_langid__0_9_0//:unic_langid",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "default",
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.13.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
-        "default",
+    version = "0.13.0",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__unic_langid__0_9_0//:unic_langid",
     ],
 )
-# Unsupported target "negotiate" with type "bench" omitted
diff --git a/cargo/remote/fluent-syntax-0.10.0.BUILD.bazel b/cargo/remote/BUILD.fluent-syntax-0.10.0.bazel
similarity index 95%
rename from cargo/remote/fluent-syntax-0.10.0.BUILD.bazel
rename to cargo/remote/BUILD.fluent-syntax-0.10.0.bazel
index 24e374223..6d986a033 100644
--- a/cargo/remote/fluent-syntax-0.10.0.BUILD.bazel
+++ b/cargo/remote/BUILD.fluent-syntax-0.10.0.bazel
@@ -28,78 +28,80 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0 OR MIT"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
-rust_library(
-    name = "fluent_syntax",
-    crate_type = "lib",
-    deps = [
-    ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.10.0",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-        "default",
-    ],
-)
 # Unsupported target "parser" with type "bench" omitted
 
-# buildifier: leave-alone
 rust_binary(
     # Prefix bin name to disambiguate from (probable) collision with lib name
     # N.B.: The exact form of this is subject to change.
     name = "cargo_bin_parser",
-    deps = [
-        # Binaries get an implicit dependency on their crate's lib
-        ":fluent_syntax",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "default",
+    ],
     crate_root = "src/bin/parser.rs",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.10.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
-        "default",
-    ],
-)
-# Unsupported target "parser_fixtures" with type "test" omitted
-
-# buildifier: leave-alone
-rust_binary(
-    # Prefix bin name to disambiguate from (probable) collision with lib name
-    # N.B.: The exact form of this is subject to change.
-    name = "cargo_bin_update_fixtures",
+    version = "0.10.0",
+    # buildifier: leave-alone
     deps = [
         # Binaries get an implicit dependency on their crate's lib
         ":fluent_syntax",
     ],
+)
+
+rust_binary(
+    # Prefix bin name to disambiguate from (probable) collision with lib name
+    # N.B.: The exact form of this is subject to change.
+    name = "cargo_bin_update_fixtures",
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "default",
+    ],
     crate_root = "src/bin/update_fixtures.rs",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.10.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
+    version = "0.10.0",
+    # buildifier: leave-alone
+    deps = [
+        # Binaries get an implicit dependency on their crate's lib
+        ":fluent_syntax",
+    ],
+)
+
+rust_library(
+    name = "fluent_syntax",
+    srcs = glob(["**/*.rs"]),
     crate_features = [
         "default",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.10.0",
+    # buildifier: leave-alone
+    deps = [
+    ],
 )
+
+# Unsupported target "parser_fixtures" with type "test" omitted
diff --git a/cargo/remote/fnv-1.0.7.BUILD.bazel b/cargo/remote/BUILD.fnv-1.0.7.bazel
similarity index 95%
rename from cargo/remote/fnv-1.0.7.BUILD.bazel
rename to cargo/remote/BUILD.fnv-1.0.7.bazel
index 5ad890bbd..b912f24ba 100644
--- a/cargo/remote/fnv-1.0.7.BUILD.bazel
+++ b/cargo/remote/BUILD.fnv-1.0.7.bazel
@@ -28,27 +28,27 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0 OR MIT"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "fnv",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "lib.rs",
-    edition = "2015",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "1.0.7",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "default",
         "std",
     ],
+    crate_root = "lib.rs",
+    crate_type = "lib",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "1.0.7",
+    # buildifier: leave-alone
+    deps = [
+    ],
 )
diff --git a/cargo/remote/BUILD.form_urlencoded-1.0.0.bazel b/cargo/remote/BUILD.form_urlencoded-1.0.0.bazel
new file mode 100644
index 000000000..b3f76ee66
--- /dev/null
+++ b/cargo/remote/BUILD.form_urlencoded-1.0.0.bazel
@@ -0,0 +1,54 @@
+"""
+@generated
+cargo-raze crate build file.
+
+DO NOT EDIT! Replaced on runs of cargo-raze
+"""
+
+# buildifier: disable=load
+load(
+    "@io_bazel_rules_rust//rust:rust.bzl",
+    "rust_binary",
+    "rust_library",
+    "rust_test",
+)
+
+# buildifier: disable=load
+load("@bazel_skylib//lib:selects.bzl", "selects")
+
+package(default_visibility = [
+    # Public for visibility by "@raze__crate__version//" targets.
+    #
+    # Prefer access through "//cargo", which limits external
+    # visibility to explicit Cargo.toml dependencies.
+    "//visibility:public",
+])
+
+licenses([
+    "notice",  # MIT from expression "MIT OR Apache-2.0"
+])
+
+# Generated Targets
+
+rust_library(
+    name = "form_urlencoded",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "1.0.0",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__matches__0_1_8//:matches",
+        "@raze__percent_encoding__2_1_0//:percent_encoding",
+    ],
+)
diff --git a/cargo/remote/fuchsia-zircon-0.3.3.BUILD.bazel b/cargo/remote/BUILD.fuchsia-zircon-0.3.3.bazel
similarity index 95%
rename from cargo/remote/fuchsia-zircon-0.3.3.BUILD.bazel
rename to cargo/remote/BUILD.fuchsia-zircon-0.3.3.bazel
index 1bef22cd5..9ae2d78a9 100644
--- a/cargo/remote/fuchsia-zircon-0.3.3.BUILD.bazel
+++ b/cargo/remote/BUILD.fuchsia-zircon-0.3.3.bazel
@@ -28,27 +28,27 @@ licenses([
     "notice",  # BSD-3-Clause from expression "BSD-3-Clause"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "fuchsia_zircon",
-    crate_type = "lib",
-    deps = [
-        "@raze__bitflags__1_2_1//:bitflags",
-        "@raze__fuchsia_zircon_sys__0_3_3//:fuchsia_zircon_sys",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.3.3",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.3.3",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__bitflags__1_2_1//:bitflags",
+        "@raze__fuchsia_zircon_sys__0_3_3//:fuchsia_zircon_sys",
     ],
 )
diff --git a/cargo/remote/fuchsia-zircon-sys-0.3.3.BUILD.bazel b/cargo/remote/BUILD.fuchsia-zircon-sys-0.3.3.bazel
similarity index 95%
rename from cargo/remote/fuchsia-zircon-sys-0.3.3.BUILD.bazel
rename to cargo/remote/BUILD.fuchsia-zircon-sys-0.3.3.bazel
index ae0aaf01c..522be2b18 100644
--- a/cargo/remote/fuchsia-zircon-sys-0.3.3.BUILD.bazel
+++ b/cargo/remote/BUILD.fuchsia-zircon-sys-0.3.3.bazel
@@ -28,26 +28,27 @@ licenses([
     "notice",  # BSD-3-Clause from expression "BSD-3-Clause"
 ])
 
-# Generated targets
+# Generated Targets
+
+# Unsupported target "hello" with type "example" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "fuchsia_zircon_sys",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.3.3",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.3.3",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
-# Unsupported target "hello" with type "example" omitted
diff --git a/cargo/remote/futures-0.3.7.BUILD.bazel b/cargo/remote/BUILD.futures-0.3.8.bazel
similarity index 87%
rename from cargo/remote/futures-0.3.7.BUILD.bazel
rename to cargo/remote/BUILD.futures-0.3.8.bazel
index 7aa4cf619..7eb2d972a 100644
--- a/cargo/remote/futures-0.3.7.BUILD.bazel
+++ b/cargo/remote/BUILD.futures-0.3.8.bazel
@@ -28,45 +28,11 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# Unsupported target "_require_features" with type "test" omitted
-# Unsupported target "abortable" with type "test" omitted
-# Unsupported target "arc_wake" with type "test" omitted
-# Unsupported target "async_await_macros" with type "test" omitted
-# Unsupported target "atomic_waker" with type "test" omitted
-# Unsupported target "basic_combinators" with type "test" omitted
-# Unsupported target "buffer_unordered" with type "test" omitted
-# Unsupported target "compat" with type "test" omitted
-# Unsupported target "eager_drop" with type "test" omitted
-# Unsupported target "eventual" with type "test" omitted
-# Unsupported target "fuse" with type "test" omitted
-# Unsupported target "future_obj" with type "test" omitted
-# Unsupported target "future_try_flatten_stream" with type "test" omitted
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "futures",
-    crate_type = "lib",
-    deps = [
-        "@raze__futures_channel__0_3_7//:futures_channel",
-        "@raze__futures_core__0_3_7//:futures_core",
-        "@raze__futures_executor__0_3_7//:futures_executor",
-        "@raze__futures_io__0_3_7//:futures_io",
-        "@raze__futures_sink__0_3_7//:futures_sink",
-        "@raze__futures_task__0_3_7//:futures_task",
-        "@raze__futures_util__0_3_7//:futures_util",
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.3.7",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "alloc",
         "async-await",
@@ -75,40 +41,125 @@ rust_library(
         "futures-executor",
         "std",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.3.8",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__futures_channel__0_3_8//:futures_channel",
+        "@raze__futures_core__0_3_8//:futures_core",
+        "@raze__futures_executor__0_3_8//:futures_executor",
+        "@raze__futures_io__0_3_8//:futures_io",
+        "@raze__futures_sink__0_3_8//:futures_sink",
+        "@raze__futures_task__0_3_8//:futures_task",
+        "@raze__futures_util__0_3_8//:futures_util",
+    ],
 )
+
+# Unsupported target "_require_features" with type "test" omitted
+
+# Unsupported target "abortable" with type "test" omitted
+
+# Unsupported target "arc_wake" with type "test" omitted
+
+# Unsupported target "async_await_macros" with type "test" omitted
+
+# Unsupported target "atomic_waker" with type "test" omitted
+
+# Unsupported target "basic_combinators" with type "test" omitted
+
+# Unsupported target "buffer_unordered" with type "test" omitted
+
+# Unsupported target "compat" with type "test" omitted
+
+# Unsupported target "eager_drop" with type "test" omitted
+
+# Unsupported target "eventual" with type "test" omitted
+
+# Unsupported target "fuse" with type "test" omitted
+
+# Unsupported target "future_obj" with type "test" omitted
+
+# Unsupported target "future_try_flatten_stream" with type "test" omitted
+
 # Unsupported target "futures_ordered" with type "test" omitted
+
 # Unsupported target "futures_unordered" with type "test" omitted
+
 # Unsupported target "inspect" with type "test" omitted
+
 # Unsupported target "io_buf_reader" with type "test" omitted
+
 # Unsupported target "io_buf_writer" with type "test" omitted
+
 # Unsupported target "io_cursor" with type "test" omitted
+
 # Unsupported target "io_lines" with type "test" omitted
+
 # Unsupported target "io_read" with type "test" omitted
+
 # Unsupported target "io_read_exact" with type "test" omitted
+
 # Unsupported target "io_read_line" with type "test" omitted
+
 # Unsupported target "io_read_to_string" with type "test" omitted
+
 # Unsupported target "io_read_until" with type "test" omitted
+
 # Unsupported target "io_window" with type "test" omitted
+
 # Unsupported target "io_write" with type "test" omitted
+
 # Unsupported target "join_all" with type "test" omitted
+
 # Unsupported target "macro_comma_support" with type "test" omitted
+
 # Unsupported target "mutex" with type "test" omitted
+
 # Unsupported target "object_safety" with type "test" omitted
+
 # Unsupported target "oneshot" with type "test" omitted
+
 # Unsupported target "ready_queue" with type "test" omitted
+
 # Unsupported target "recurse" with type "test" omitted
+
 # Unsupported target "select_all" with type "test" omitted
+
 # Unsupported target "select_ok" with type "test" omitted
+
 # Unsupported target "shared" with type "test" omitted
+
 # Unsupported target "sink" with type "test" omitted
+
 # Unsupported target "sink_fanout" with type "test" omitted
+
 # Unsupported target "split" with type "test" omitted
+
 # Unsupported target "stream" with type "test" omitted
+
 # Unsupported target "stream_catch_unwind" with type "test" omitted
+
 # Unsupported target "stream_into_async_read" with type "test" omitted
+
 # Unsupported target "stream_peekable" with type "test" omitted
+
 # Unsupported target "stream_select_all" with type "test" omitted
+
 # Unsupported target "stream_select_next_some" with type "test" omitted
+
 # Unsupported target "try_join" with type "test" omitted
+
 # Unsupported target "try_join_all" with type "test" omitted
+
+# Unsupported target "try_stream" with type "test" omitted
+
 # Unsupported target "unfold" with type "test" omitted
diff --git a/cargo/remote/futures-channel-0.3.7.BUILD.bazel b/cargo/remote/BUILD.futures-channel-0.3.8.bazel
similarity index 87%
rename from cargo/remote/futures-channel-0.3.7.BUILD.bazel
rename to cargo/remote/BUILD.futures-channel-0.3.8.bazel
index 5fd764205..bdcd9775c 100644
--- a/cargo/remote/futures-channel-0.3.7.BUILD.bazel
+++ b/cargo/remote/BUILD.futures-channel-0.3.8.bazel
@@ -28,28 +28,13 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# Unsupported target "channel" with type "test" omitted
+# Generated Targets
+
+# Unsupported target "sync_mpsc" with type "bench" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "futures_channel",
-    crate_type = "lib",
-    deps = [
-        "@raze__futures_core__0_3_7//:futures_core",
-        "@raze__futures_sink__0_3_7//:futures_sink",
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.3.7",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "alloc",
         "default",
@@ -57,8 +42,28 @@ rust_library(
         "sink",
         "std",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.3.8",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__futures_core__0_3_8//:futures_core",
+        "@raze__futures_sink__0_3_8//:futures_sink",
+    ],
 )
+
+# Unsupported target "channel" with type "test" omitted
+
 # Unsupported target "mpsc" with type "test" omitted
+
 # Unsupported target "mpsc-close" with type "test" omitted
+
 # Unsupported target "oneshot" with type "test" omitted
-# Unsupported target "sync_mpsc" with type "bench" omitted
diff --git a/cargo/remote/futures-core-0.3.7.BUILD.bazel b/cargo/remote/BUILD.futures-core-0.3.8.bazel
similarity index 93%
rename from cargo/remote/futures-core-0.3.7.BUILD.bazel
rename to cargo/remote/BUILD.futures-core-0.3.8.bazel
index 7eb18614a..f9a2c46a3 100644
--- a/cargo/remote/futures-core-0.3.7.BUILD.bazel
+++ b/cargo/remote/BUILD.futures-core-0.3.8.bazel
@@ -28,28 +28,28 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "futures_core",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.3.7",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "alloc",
         "default",
         "std",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.3.8",
+    # buildifier: leave-alone
+    deps = [
+    ],
 )
diff --git a/cargo/remote/futures-executor-0.3.7.BUILD.bazel b/cargo/remote/BUILD.futures-executor-0.3.8.bazel
similarity index 82%
rename from cargo/remote/futures-executor-0.3.7.BUILD.bazel
rename to cargo/remote/BUILD.futures-executor-0.3.8.bazel
index f92d7d57a..7fcda8f4f 100644
--- a/cargo/remote/futures-executor-0.3.7.BUILD.bazel
+++ b/cargo/remote/BUILD.futures-executor-0.3.8.bazel
@@ -28,31 +28,33 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
+
+# Unsupported target "thread_notify" with type "bench" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "futures_executor",
-    crate_type = "lib",
-    deps = [
-        "@raze__futures_core__0_3_7//:futures_core",
-        "@raze__futures_task__0_3_7//:futures_task",
-        "@raze__futures_util__0_3_7//:futures_util",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "std",
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.3.7",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
-        "std",
+    version = "0.3.8",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__futures_core__0_3_8//:futures_core",
+        "@raze__futures_task__0_3_8//:futures_task",
+        "@raze__futures_util__0_3_8//:futures_util",
     ],
 )
+
 # Unsupported target "local_pool" with type "test" omitted
-# Unsupported target "thread_notify" with type "bench" omitted
diff --git a/cargo/remote/futures-io-0.3.7.BUILD.bazel b/cargo/remote/BUILD.futures-io-0.3.8.bazel
similarity index 92%
rename from cargo/remote/futures-io-0.3.7.BUILD.bazel
rename to cargo/remote/BUILD.futures-io-0.3.8.bazel
index 91b639ab6..df71cdfa5 100644
--- a/cargo/remote/futures-io-0.3.7.BUILD.bazel
+++ b/cargo/remote/BUILD.futures-io-0.3.8.bazel
@@ -28,26 +28,26 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "futures_io",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "std",
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.3.7",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
-        "std",
+    version = "0.3.8",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
diff --git a/cargo/remote/futures-macro-0.3.7.BUILD.bazel b/cargo/remote/BUILD.futures-macro-0.3.8.bazel
similarity index 94%
rename from cargo/remote/futures-macro-0.3.7.BUILD.bazel
rename to cargo/remote/BUILD.futures-macro-0.3.8.bazel
index abd9ea162..ad8a355cf 100644
--- a/cargo/remote/futures-macro-0.3.7.BUILD.bazel
+++ b/cargo/remote/BUILD.futures-macro-0.3.8.bazel
@@ -28,19 +28,15 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "futures_macro",
-    crate_type = "proc-macro",
-    deps = [
-        "@raze__proc_macro2__1_0_24//:proc_macro2",
-        "@raze__quote__1_0_7//:quote",
-        "@raze__syn__1_0_48//:syn",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "proc-macro",
     edition = "2018",
     proc_macro_deps = [
         "@raze__proc_macro_hack__0_5_19//:proc_macro_hack",
@@ -48,11 +44,15 @@ rust_library(
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.3.7",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.3.8",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__proc_macro2__1_0_24//:proc_macro2",
+        "@raze__quote__1_0_7//:quote",
+        "@raze__syn__1_0_48//:syn",
     ],
 )
diff --git a/cargo/remote/futures-sink-0.3.7.BUILD.bazel b/cargo/remote/BUILD.futures-sink-0.3.8.bazel
similarity index 93%
rename from cargo/remote/futures-sink-0.3.7.BUILD.bazel
rename to cargo/remote/BUILD.futures-sink-0.3.8.bazel
index 0da3c9a8a..c3cebee2b 100644
--- a/cargo/remote/futures-sink-0.3.7.BUILD.bazel
+++ b/cargo/remote/BUILD.futures-sink-0.3.8.bazel
@@ -28,28 +28,28 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "futures_sink",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.3.7",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "alloc",
         "default",
         "std",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.3.8",
+    # buildifier: leave-alone
+    deps = [
+    ],
 )
diff --git a/cargo/remote/futures-task-0.3.7.BUILD.bazel b/cargo/remote/BUILD.futures-task-0.3.8.bazel
similarity index 93%
rename from cargo/remote/futures-task-0.3.7.BUILD.bazel
rename to cargo/remote/BUILD.futures-task-0.3.8.bazel
index e06529d60..ec27e366d 100644
--- a/cargo/remote/futures-task-0.3.7.BUILD.bazel
+++ b/cargo/remote/BUILD.futures-task-0.3.8.bazel
@@ -28,29 +28,29 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "futures_task",
-    crate_type = "lib",
-    deps = [
-        "@raze__once_cell__1_4_1//:once_cell",
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.3.7",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "alloc",
         "once_cell",
         "std",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.3.8",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__once_cell__1_4_1//:once_cell",
+    ],
 )
diff --git a/cargo/remote/futures-util-0.3.7.BUILD.bazel b/cargo/remote/BUILD.futures-util-0.3.8.bazel
similarity index 80%
rename from cargo/remote/futures-util-0.3.7.BUILD.bazel
rename to cargo/remote/BUILD.futures-util-0.3.8.bazel
index ae1270019..662ba18ce 100644
--- a/cargo/remote/futures-util-0.3.7.BUILD.bazel
+++ b/cargo/remote/BUILD.futures-util-0.3.8.bazel
@@ -28,39 +28,13 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
+
+# Unsupported target "futures_unordered" with type "bench" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "futures_util",
-    crate_type = "lib",
-    deps = [
-        "@raze__futures_channel__0_3_7//:futures_channel",
-        "@raze__futures_core__0_3_7//:futures_core",
-        "@raze__futures_io__0_3_7//:futures_io",
-        "@raze__futures_sink__0_3_7//:futures_sink",
-        "@raze__futures_task__0_3_7//:futures_task",
-        "@raze__memchr__2_3_4//:memchr",
-        "@raze__pin_project__1_0_1//:pin_project",
-        "@raze__pin_utils__0_1_0//:pin_utils",
-        "@raze__proc_macro_nested__0_1_6//:proc_macro_nested",
-        "@raze__slab__0_4_2//:slab",
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    proc_macro_deps = [
-        "@raze__futures_macro__0_3_7//:futures_macro",
-        "@raze__proc_macro_hack__0_5_19//:proc_macro_hack",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.3.7",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "alloc",
         "async-await",
@@ -79,5 +53,32 @@ rust_library(
         "slab",
         "std",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2018",
+    proc_macro_deps = [
+        "@raze__futures_macro__0_3_8//:futures_macro",
+        "@raze__proc_macro_hack__0_5_19//:proc_macro_hack",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.3.8",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__futures_channel__0_3_8//:futures_channel",
+        "@raze__futures_core__0_3_8//:futures_core",
+        "@raze__futures_io__0_3_8//:futures_io",
+        "@raze__futures_sink__0_3_8//:futures_sink",
+        "@raze__futures_task__0_3_8//:futures_task",
+        "@raze__memchr__2_3_4//:memchr",
+        "@raze__pin_project__1_0_1//:pin_project",
+        "@raze__pin_utils__0_1_0//:pin_utils",
+        "@raze__proc_macro_nested__0_1_6//:proc_macro_nested",
+        "@raze__slab__0_4_2//:slab",
+    ],
 )
-# Unsupported target "futures_unordered" with type "bench" omitted
diff --git a/cargo/remote/fxhash-0.2.1.BUILD.bazel b/cargo/remote/BUILD.fxhash-0.2.1.bazel
similarity index 95%
rename from cargo/remote/fxhash-0.2.1.BUILD.bazel
rename to cargo/remote/BUILD.fxhash-0.2.1.bazel
index bc2fdb0aa..5cd11d54b 100644
--- a/cargo/remote/fxhash-0.2.1.BUILD.bazel
+++ b/cargo/remote/BUILD.fxhash-0.2.1.bazel
@@ -28,27 +28,28 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0 OR MIT"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "fxhash" with type "bench" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "fxhash",
-    crate_type = "lib",
-    deps = [
-        "@raze__byteorder__1_3_4//:byteorder",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.2.1",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.2.1",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__byteorder__1_3_4//:byteorder",
     ],
 )
diff --git a/cargo/remote/generic-array-0.14.4.BUILD.bazel b/cargo/remote/BUILD.generic-array-0.14.4.bazel
similarity index 94%
rename from cargo/remote/generic-array-0.14.4.BUILD.bazel
rename to cargo/remote/BUILD.generic-array-0.14.4.bazel
index 14570240b..444a5509b 100644
--- a/cargo/remote/generic-array-0.14.4.BUILD.bazel
+++ b/cargo/remote/BUILD.generic-array-0.14.4.bazel
@@ -28,64 +28,67 @@ licenses([
     "notice",  # MIT from expression "MIT"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "generic_array_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build.rs",
-    edition = "2015",
-    deps = [
-        "@raze__version_check__0_9_2//:version_check",
+    build_script_env = {
+    },
+    crate_features = [
     ],
+    crate_root = "build.rs",
+    data = glob(["**"]),
+    edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    crate_features = [
-    ],
-    build_script_env = {
-    },
-    data = glob(["**"]),
     tags = [
         "cargo-raze",
         "manual",
     ],
     version = "0.14.4",
     visibility = ["//visibility:private"],
+    deps = [
+        "@raze__version_check__0_9_2//:version_check",
+    ],
 )
 
-# Unsupported target "arr" with type "test" omitted
-
-# buildifier: leave-alone
 rust_library(
     name = "generic_array",
-    crate_type = "lib",
-    deps = [
-        ":generic_array_build_script",
-        "@raze__typenum__1_12_0//:typenum",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.14.4",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.14.4",
+    # buildifier: leave-alone
+    deps = [
+        ":generic_array_build_script",
+        "@raze__typenum__1_12_0//:typenum",
     ],
 )
+
+# Unsupported target "arr" with type "test" omitted
+
 # Unsupported target "generics" with type "test" omitted
+
 # Unsupported target "hex" with type "test" omitted
+
 # Unsupported target "import_name" with type "test" omitted
+
 # Unsupported target "iter" with type "test" omitted
+
 # Unsupported target "mod" with type "test" omitted
diff --git a/cargo/remote/getrandom-0.1.15.BUILD.bazel b/cargo/remote/BUILD.getrandom-0.1.15.bazel
similarity index 95%
rename from cargo/remote/getrandom-0.1.15.BUILD.bazel
rename to cargo/remote/BUILD.getrandom-0.1.15.bazel
index 38778228f..eba75dc24 100644
--- a/cargo/remote/getrandom-0.1.15.BUILD.bazel
+++ b/cargo/remote/BUILD.getrandom-0.1.15.bazel
@@ -28,19 +28,32 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "getrandom_build_script",
     srcs = glob(["**/*.rs"]),
+    build_script_env = {
+    },
+    crate_features = [
+        "std",
+    ],
     crate_root = "build.rs",
+    data = glob(["**"]),
     edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.1.15",
+    visibility = ["//visibility:private"],
     deps = [
     ] + selects.with_or({
         # cfg(unix)
@@ -55,29 +68,30 @@ cargo_build_script(
         ],
         "//conditions:default": [],
     }),
+)
+
+# Unsupported target "mod" with type "bench" omitted
+
+rust_library(
+    name = "getrandom",
+    srcs = glob(["**/*.rs"]),
+    aliases = {
+    },
+    crate_features = [
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    crate_features = [
-      "std",
-    ],
-    build_script_env = {
-    },
-    data = glob(["**"]),
     tags = [
         "cargo-raze",
         "manual",
     ],
     version = "0.1.15",
-    visibility = ["//visibility:private"],
-)
-
-# Unsupported target "common" with type "test" omitted
-
-# buildifier: leave-alone
-rust_library(
-    name = "getrandom",
-    crate_type = "lib",
+    # buildifier: leave-alone
     deps = [
         ":getrandom_build_script",
         "@raze__cfg_if__0_1_10//:cfg_if",
@@ -95,21 +109,6 @@ rust_library(
         ],
         "//conditions:default": [],
     }),
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.1.15",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-        "std",
-    ],
-    aliases = {
-    },
 )
-# Unsupported target "mod" with type "bench" omitted
+
+# Unsupported target "common" with type "test" omitted
diff --git a/cargo/remote/ghost-0.1.2.BUILD.bazel b/cargo/remote/BUILD.ghost-0.1.2.bazel
similarity index 95%
rename from cargo/remote/ghost-0.1.2.BUILD.bazel
rename to cargo/remote/BUILD.ghost-0.1.2.bazel
index ab67e6268..4203aab2d 100644
--- a/cargo/remote/ghost-0.1.2.BUILD.bazel
+++ b/cargo/remote/BUILD.ghost-0.1.2.bazel
@@ -28,28 +28,28 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "ghost",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "proc-macro",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.1.2",
+    # buildifier: leave-alone
     deps = [
         "@raze__proc_macro2__1_0_24//:proc_macro2",
         "@raze__quote__1_0_7//:quote",
         "@raze__syn__1_0_48//:syn",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.1.2",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-    ],
 )
diff --git a/cargo/remote/gimli-0.23.0.BUILD.bazel b/cargo/remote/BUILD.gimli-0.23.0.bazel
similarity index 96%
rename from cargo/remote/gimli-0.23.0.BUILD.bazel
rename to cargo/remote/BUILD.gimli-0.23.0.bazel
index ec3f86d8d..62ea9fc33 100644
--- a/cargo/remote/gimli-0.23.0.BUILD.bazel
+++ b/cargo/remote/BUILD.gimli-0.23.0.bazel
@@ -28,33 +28,40 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0 OR MIT"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "bench" with type "bench" omitted
-# Unsupported target "convert_self" with type "test" omitted
+
 # Unsupported target "dwarf-validate" with type "example" omitted
+
 # Unsupported target "dwarfdump" with type "example" omitted
 
-# buildifier: leave-alone
+# Unsupported target "simple" with type "example" omitted
+
+# Unsupported target "simple_line" with type "example" omitted
+
 rust_library(
     name = "gimli",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "read",
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.23.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
-        "read",
+    version = "0.23.0",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
+
+# Unsupported target "convert_self" with type "test" omitted
+
 # Unsupported target "parse_self" with type "test" omitted
-# Unsupported target "simple" with type "example" omitted
-# Unsupported target "simple_line" with type "example" omitted
diff --git a/cargo/remote/h2-0.2.7.BUILD.bazel b/cargo/remote/BUILD.h2-0.2.7.bazel
similarity index 87%
rename from cargo/remote/h2-0.2.7.BUILD.bazel
rename to cargo/remote/BUILD.h2-0.2.7.bazel
index 20e0ee8c3..77637f5cc 100644
--- a/cargo/remote/h2-0.2.7.BUILD.bazel
+++ b/cargo/remote/BUILD.h2-0.2.7.bazel
@@ -28,20 +28,37 @@ licenses([
     "notice",  # MIT from expression "MIT"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "akamai" with type "example" omitted
+
 # Unsupported target "client" with type "example" omitted
 
-# buildifier: leave-alone
+# Unsupported target "server" with type "example" omitted
+
 rust_library(
     name = "h2",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.2.7",
+    # buildifier: leave-alone
     deps = [
         "@raze__bytes__0_5_6//:bytes",
         "@raze__fnv__1_0_7//:fnv",
-        "@raze__futures_core__0_3_7//:futures_core",
-        "@raze__futures_sink__0_3_7//:futures_sink",
-        "@raze__futures_util__0_3_7//:futures_util",
+        "@raze__futures_core__0_3_8//:futures_core",
+        "@raze__futures_sink__0_3_8//:futures_sink",
+        "@raze__futures_util__0_3_8//:futures_util",
         "@raze__http__0_2_1//:http",
         "@raze__indexmap__1_6_0//:indexmap",
         "@raze__slab__0_4_2//:slab",
@@ -50,18 +67,4 @@ rust_library(
         "@raze__tracing__0_1_21//:tracing",
         "@raze__tracing_futures__0_2_4//:tracing_futures",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.2.7",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-    ],
 )
-# Unsupported target "server" with type "example" omitted
diff --git a/cargo/remote/hashbrown-0.9.1.BUILD.bazel b/cargo/remote/BUILD.hashbrown-0.9.1.bazel
similarity index 96%
rename from cargo/remote/hashbrown-0.9.1.BUILD.bazel
rename to cargo/remote/BUILD.hashbrown-0.9.1.bazel
index 0452dfe12..38033a598 100644
--- a/cargo/remote/hashbrown-0.9.1.BUILD.bazel
+++ b/cargo/remote/BUILD.hashbrown-0.9.1.bazel
@@ -28,35 +28,40 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0 OR MIT"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "bench" with type "bench" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "hashbrown",
-    crate_type = "lib",
-    deps = [
-        "@raze__ahash__0_4_6//:ahash",
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.9.1",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "ahash",
         "default",
         "inline-more",
         "raw",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.9.1",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__ahash__0_4_6//:ahash",
+    ],
 )
+
 # Unsupported target "hasher" with type "test" omitted
+
 # Unsupported target "rayon" with type "test" omitted
+
 # Unsupported target "serde" with type "test" omitted
+
 # Unsupported target "set" with type "test" omitted
diff --git a/cargo/remote/hashlink-0.6.0.BUILD.bazel b/cargo/remote/BUILD.hashlink-0.6.0.bazel
similarity index 95%
rename from cargo/remote/hashlink-0.6.0.BUILD.bazel
rename to cargo/remote/BUILD.hashlink-0.6.0.bazel
index 55f4fc74d..eabaff529 100644
--- a/cargo/remote/hashlink-0.6.0.BUILD.bazel
+++ b/cargo/remote/BUILD.hashlink-0.6.0.bazel
@@ -28,30 +28,34 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "hashlink",
-    crate_type = "lib",
-    deps = [
-        "@raze__hashbrown__0_9_1//:hashbrown",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.6.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.6.0",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__hashbrown__0_9_1//:hashbrown",
     ],
 )
+
 # Unsupported target "linked_hash_map" with type "test" omitted
+
 # Unsupported target "linked_hash_set" with type "test" omitted
+
 # Unsupported target "lru_cache" with type "test" omitted
+
 # Unsupported target "serde" with type "test" omitted
diff --git a/cargo/remote/heck-0.3.1.BUILD.bazel b/cargo/remote/BUILD.heck-0.3.1.bazel
similarity index 95%
rename from cargo/remote/heck-0.3.1.BUILD.bazel
rename to cargo/remote/BUILD.heck-0.3.1.bazel
index cd95f5088..40fb8ac9f 100644
--- a/cargo/remote/heck-0.3.1.BUILD.bazel
+++ b/cargo/remote/BUILD.heck-0.3.1.bazel
@@ -28,26 +28,26 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "heck",
-    crate_type = "lib",
-    deps = [
-        "@raze__unicode_segmentation__1_6_0//:unicode_segmentation",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.3.1",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.3.1",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__unicode_segmentation__1_6_0//:unicode_segmentation",
     ],
 )
diff --git a/cargo/remote/hermit-abi-0.1.17.BUILD.bazel b/cargo/remote/BUILD.hermit-abi-0.1.17.bazel
similarity index 95%
rename from cargo/remote/hermit-abi-0.1.17.BUILD.bazel
rename to cargo/remote/BUILD.hermit-abi-0.1.17.bazel
index 699e8e8d6..5b53ab1d3 100644
--- a/cargo/remote/hermit-abi-0.1.17.BUILD.bazel
+++ b/cargo/remote/BUILD.hermit-abi-0.1.17.bazel
@@ -28,27 +28,27 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "hermit_abi",
-    crate_type = "lib",
-    deps = [
-        "@raze__libc__0_2_80//:libc",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "default",
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.1.17",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
-        "default",
+    version = "0.1.17",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__libc__0_2_80//:libc",
     ],
 )
diff --git a/cargo/remote/hex-0.4.2.BUILD.bazel b/cargo/remote/BUILD.hex-0.4.2.bazel
similarity index 95%
rename from cargo/remote/hex-0.4.2.BUILD.bazel
rename to cargo/remote/BUILD.hex-0.4.2.bazel
index 781b253b9..83f11d30a 100644
--- a/cargo/remote/hex-0.4.2.BUILD.bazel
+++ b/cargo/remote/BUILD.hex-0.4.2.bazel
@@ -28,30 +28,33 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "hex" with type "bench" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "hex",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.4.2",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "default",
         "std",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.4.2",
+    # buildifier: leave-alone
+    deps = [
+    ],
 )
+
 # Unsupported target "serde" with type "test" omitted
+
 # Unsupported target "version-number" with type "test" omitted
diff --git a/cargo/remote/htmlescape-0.3.1.BUILD.bazel b/cargo/remote/BUILD.htmlescape-0.3.1.bazel
similarity index 95%
rename from cargo/remote/htmlescape-0.3.1.BUILD.bazel
rename to cargo/remote/BUILD.htmlescape-0.3.1.bazel
index 0829740dc..bf6ceada5 100644
--- a/cargo/remote/htmlescape-0.3.1.BUILD.bazel
+++ b/cargo/remote/BUILD.htmlescape-0.3.1.bazel
@@ -28,27 +28,29 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0 OR (MIT OR MPL-2.0)"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "bench" with type "bench" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "htmlescape",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.3.1",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.3.1",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
+
 # Unsupported target "test" with type "test" omitted
diff --git a/cargo/remote/http-0.2.1.BUILD.bazel b/cargo/remote/BUILD.http-0.2.1.bazel
similarity index 96%
rename from cargo/remote/http-0.2.1.BUILD.bazel
rename to cargo/remote/BUILD.http-0.2.1.bazel
index 270221cc0..19e7cd558 100644
--- a/cargo/remote/http-0.2.1.BUILD.bazel
+++ b/cargo/remote/BUILD.http-0.2.1.bazel
@@ -28,35 +28,42 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "header_map" with type "bench" omitted
-# Unsupported target "header_map" with type "test" omitted
-# Unsupported target "header_map_fuzz" with type "test" omitted
+
 # Unsupported target "header_name" with type "bench" omitted
+
 # Unsupported target "header_value" with type "bench" omitted
 
-# buildifier: leave-alone
+# Unsupported target "uri" with type "bench" omitted
+
 rust_library(
     name = "http",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.2.1",
+    # buildifier: leave-alone
     deps = [
         "@raze__bytes__0_5_6//:bytes",
         "@raze__fnv__1_0_7//:fnv",
         "@raze__itoa__0_4_6//:itoa",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.2.1",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-    ],
 )
+
+# Unsupported target "header_map" with type "test" omitted
+
+# Unsupported target "header_map_fuzz" with type "test" omitted
+
 # Unsupported target "status_code" with type "test" omitted
-# Unsupported target "uri" with type "bench" omitted
diff --git a/cargo/remote/http-body-0.3.1.BUILD.bazel b/cargo/remote/BUILD.http-body-0.3.1.bazel
similarity index 95%
rename from cargo/remote/http-body-0.3.1.BUILD.bazel
rename to cargo/remote/BUILD.http-body-0.3.1.bazel
index 400dbfa3e..22e7ea493 100644
--- a/cargo/remote/http-body-0.3.1.BUILD.bazel
+++ b/cargo/remote/BUILD.http-body-0.3.1.bazel
@@ -28,28 +28,29 @@ licenses([
     "notice",  # MIT from expression "MIT"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "http_body",
-    crate_type = "lib",
-    deps = [
-        "@raze__bytes__0_5_6//:bytes",
-        "@raze__http__0_2_1//:http",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.3.1",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.3.1",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__bytes__0_5_6//:bytes",
+        "@raze__http__0_2_1//:http",
     ],
 )
+
 # Unsupported target "is_end_stream" with type "test" omitted
diff --git a/cargo/remote/httparse-1.3.4.BUILD.bazel b/cargo/remote/BUILD.httparse-1.3.4.bazel
similarity index 92%
rename from cargo/remote/httparse-1.3.4.BUILD.bazel
rename to cargo/remote/BUILD.httparse-1.3.4.bazel
index 80321812e..faa732701 100644
--- a/cargo/remote/httparse-1.3.4.BUILD.bazel
+++ b/cargo/remote/BUILD.httparse-1.3.4.bazel
@@ -28,62 +28,61 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "httparse_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build.rs",
-    edition = "2015",
-    deps = [
+    build_script_env = {
+    },
+    crate_features = [
+        "default",
+        "std",
     ],
+    crate_root = "build.rs",
+    data = glob(["**"]),
+    edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    crate_features = [
-      "default",
-      "std",
-    ],
-    build_script_env = {
-    },
-    data = glob(["**"]),
     tags = [
         "cargo-raze",
         "manual",
     ],
     version = "1.3.4",
     visibility = ["//visibility:private"],
+    deps = [
+    ],
 )
 
+# Unsupported target "parse" with type "bench" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "httparse",
-    crate_type = "lib",
-    deps = [
-        ":httparse_build_script",
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "1.3.4",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "default",
         "std",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "1.3.4",
+    # buildifier: leave-alone
+    deps = [
+        ":httparse_build_script",
+    ],
 )
-# Unsupported target "parse" with type "bench" omitted
+
 # Unsupported target "uri" with type "test" omitted
diff --git a/cargo/remote/httpdate-0.3.2.BUILD.bazel b/cargo/remote/BUILD.httpdate-0.3.2.bazel
similarity index 95%
rename from cargo/remote/httpdate-0.3.2.BUILD.bazel
rename to cargo/remote/BUILD.httpdate-0.3.2.bazel
index a4b7dc4b9..03dcee6d7 100644
--- a/cargo/remote/httpdate-0.3.2.BUILD.bazel
+++ b/cargo/remote/BUILD.httpdate-0.3.2.bazel
@@ -28,25 +28,25 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "httpdate",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.3.2",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.3.2",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
diff --git a/cargo/remote/humansize-1.1.0.BUILD.bazel b/cargo/remote/BUILD.humansize-1.1.0.bazel
similarity index 95%
rename from cargo/remote/humansize-1.1.0.BUILD.bazel
rename to cargo/remote/BUILD.humansize-1.1.0.bazel
index 21311f43d..f9adc462c 100644
--- a/cargo/remote/humansize-1.1.0.BUILD.bazel
+++ b/cargo/remote/BUILD.humansize-1.1.0.bazel
@@ -28,27 +28,29 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "custom_options" with type "example" omitted
 
-# buildifier: leave-alone
+# Unsupported target "sizes" with type "example" omitted
+
 rust_library(
     name = "humansize",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "1.1.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "1.1.0",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
-# Unsupported target "sizes" with type "example" omitted
diff --git a/cargo/remote/humantime-2.0.1.BUILD.bazel b/cargo/remote/BUILD.humantime-2.0.1.bazel
similarity index 95%
rename from cargo/remote/humantime-2.0.1.BUILD.bazel
rename to cargo/remote/BUILD.humantime-2.0.1.bazel
index 866bab849..f6f47f551 100644
--- a/cargo/remote/humantime-2.0.1.BUILD.bazel
+++ b/cargo/remote/BUILD.humantime-2.0.1.bazel
@@ -28,27 +28,29 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "datetime_format" with type "bench" omitted
+
 # Unsupported target "datetime_parse" with type "bench" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "humantime",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "2.0.1",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "2.0.1",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
diff --git a/cargo/remote/hyper-0.13.9.BUILD.bazel b/cargo/remote/BUILD.hyper-0.13.9.bazel
similarity index 93%
rename from cargo/remote/hyper-0.13.9.BUILD.bazel
rename to cargo/remote/BUILD.hyper-0.13.9.bazel
index c9ea23a64..187c2de37 100644
--- a/cargo/remote/hyper-0.13.9.BUILD.bazel
+++ b/cargo/remote/BUILD.hyper-0.13.9.bazel
@@ -28,27 +28,76 @@ licenses([
     "notice",  # MIT from expression "MIT"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "body" with type "bench" omitted
-# Unsupported target "client" with type "example" omitted
-# Unsupported target "client" with type "test" omitted
-# Unsupported target "client_json" with type "example" omitted
+
 # Unsupported target "connect" with type "bench" omitted
-# Unsupported target "echo" with type "example" omitted
+
 # Unsupported target "end_to_end" with type "bench" omitted
+
+# Unsupported target "pipeline" with type "bench" omitted
+
+# Unsupported target "server" with type "bench" omitted
+
+# Unsupported target "client" with type "example" omitted
+
+# Unsupported target "client_json" with type "example" omitted
+
+# Unsupported target "echo" with type "example" omitted
+
 # Unsupported target "gateway" with type "example" omitted
+
 # Unsupported target "hello" with type "example" omitted
+
 # Unsupported target "http_proxy" with type "example" omitted
 
-# buildifier: leave-alone
+# Unsupported target "multi_server" with type "example" omitted
+
+# Unsupported target "params" with type "example" omitted
+
+# Unsupported target "send_file" with type "example" omitted
+
+# Unsupported target "service_struct_impl" with type "example" omitted
+
+# Unsupported target "single_threaded" with type "example" omitted
+
+# Unsupported target "state" with type "example" omitted
+
+# Unsupported target "tower_client" with type "example" omitted
+
+# Unsupported target "tower_server" with type "example" omitted
+
+# Unsupported target "upgrades" with type "example" omitted
+
+# Unsupported target "web_api" with type "example" omitted
+
 rust_library(
     name = "hyper",
+    srcs = glob(["**/*.rs"]),
+    aliases = {
+    },
+    crate_features = [
+        "socket2",
+        "tcp",
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.13.9",
+    # buildifier: leave-alone
     deps = [
         "@raze__bytes__0_5_6//:bytes",
-        "@raze__futures_channel__0_3_7//:futures_channel",
-        "@raze__futures_core__0_3_7//:futures_core",
-        "@raze__futures_util__0_3_7//:futures_util",
+        "@raze__futures_channel__0_3_8//:futures_channel",
+        "@raze__futures_core__0_3_8//:futures_core",
+        "@raze__futures_util__0_3_8//:futures_util",
         "@raze__h2__0_2_7//:h2",
         "@raze__http__0_2_1//:http",
         "@raze__http_body__0_3_1//:http_body",
@@ -72,35 +121,10 @@ rust_library(
         ],
         "//conditions:default": [],
     }),
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.13.9",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-        "socket2",
-        "tcp",
-    ],
-    aliases = {
-    },
 )
+
+# Unsupported target "client" with type "test" omitted
+
 # Unsupported target "integration" with type "test" omitted
-# Unsupported target "multi_server" with type "example" omitted
-# Unsupported target "params" with type "example" omitted
-# Unsupported target "pipeline" with type "bench" omitted
-# Unsupported target "send_file" with type "example" omitted
-# Unsupported target "server" with type "bench" omitted
+
 # Unsupported target "server" with type "test" omitted
-# Unsupported target "service_struct_impl" with type "example" omitted
-# Unsupported target "single_threaded" with type "example" omitted
-# Unsupported target "state" with type "example" omitted
-# Unsupported target "tower_client" with type "example" omitted
-# Unsupported target "tower_server" with type "example" omitted
-# Unsupported target "upgrades" with type "example" omitted
-# Unsupported target "web_api" with type "example" omitted
diff --git a/cargo/remote/hyper-rustls-0.21.0.BUILD.bazel b/cargo/remote/BUILD.hyper-rustls-0.21.0.bazel
similarity index 93%
rename from cargo/remote/hyper-rustls-0.21.0.BUILD.bazel
rename to cargo/remote/BUILD.hyper-rustls-0.21.0.bazel
index 1761932df..bb13f1485 100644
--- a/cargo/remote/hyper-rustls-0.21.0.BUILD.bazel
+++ b/cargo/remote/BUILD.hyper-rustls-0.21.0.bazel
@@ -28,16 +28,32 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0 OR (ISC OR MIT)"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "client" with type "example" omitted
 
-# buildifier: leave-alone
+# Unsupported target "server" with type "example" omitted
+
 rust_library(
     name = "hyper_rustls",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.21.0",
+    # buildifier: leave-alone
     deps = [
         "@raze__bytes__0_5_6//:bytes",
-        "@raze__futures_util__0_3_7//:futures_util",
+        "@raze__futures_util__0_3_8//:futures_util",
         "@raze__hyper__0_13_9//:hyper",
         "@raze__log__0_4_11//:log",
         "@raze__rustls__0_18_1//:rustls",
@@ -45,19 +61,6 @@ rust_library(
         "@raze__tokio_rustls__0_14_1//:tokio_rustls",
         "@raze__webpki__0_21_3//:webpki",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.21.0",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-    ],
 )
-# Unsupported target "server" with type "example" omitted
+
 # Unsupported target "tests" with type "test" omitted
diff --git a/cargo/remote/hyper-timeout-0.3.1.BUILD.bazel b/cargo/remote/BUILD.hyper-timeout-0.3.1.bazel
similarity index 95%
rename from cargo/remote/hyper-timeout-0.3.1.BUILD.bazel
rename to cargo/remote/BUILD.hyper-timeout-0.3.1.bazel
index 0f8e61883..84001ba68 100644
--- a/cargo/remote/hyper-timeout-0.3.1.BUILD.bazel
+++ b/cargo/remote/BUILD.hyper-timeout-0.3.1.bazel
@@ -28,30 +28,31 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "client" with type "example" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "hyper_timeout",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.3.1",
+    # buildifier: leave-alone
     deps = [
         "@raze__bytes__0_5_6//:bytes",
         "@raze__hyper__0_13_9//:hyper",
         "@raze__tokio__0_2_22//:tokio",
         "@raze__tokio_io_timeout__0_4_0//:tokio_io_timeout",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.3.1",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-    ],
 )
diff --git a/cargo/remote/idna-0.2.0.BUILD.bazel b/cargo/remote/BUILD.idna-0.2.0.bazel
similarity index 95%
rename from cargo/remote/idna-0.2.0.BUILD.bazel
rename to cargo/remote/BUILD.idna-0.2.0.bazel
index 46bc1a3f8..378434e10 100644
--- a/cargo/remote/idna-0.2.0.BUILD.bazel
+++ b/cargo/remote/BUILD.idna-0.2.0.bazel
@@ -28,30 +28,32 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "idna",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.2.0",
+    # buildifier: leave-alone
     deps = [
         "@raze__matches__0_1_8//:matches",
         "@raze__unicode_bidi__0_3_4//:unicode_bidi",
         "@raze__unicode_normalization__0_1_13//:unicode_normalization",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.2.0",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-    ],
 )
+
 # Unsupported target "tests" with type "test" omitted
+
 # Unsupported target "unit" with type "test" omitted
diff --git a/cargo/remote/indexmap-1.6.0.BUILD.bazel b/cargo/remote/BUILD.indexmap-1.6.0.bazel
similarity index 94%
rename from cargo/remote/indexmap-1.6.0.BUILD.bazel
rename to cargo/remote/BUILD.indexmap-1.6.0.bazel
index cd528d3aa..8f56f7e8d 100644
--- a/cargo/remote/indexmap-1.6.0.BUILD.bazel
+++ b/cargo/remote/BUILD.indexmap-1.6.0.bazel
@@ -28,64 +28,67 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0 OR MIT"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "indexmap_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build.rs",
-    edition = "2018",
-    deps = [
-        "@raze__autocfg__1_0_1//:autocfg",
+    build_script_env = {
+    },
+    crate_features = [
     ],
+    crate_root = "build.rs",
+    data = glob(["**"]),
+    edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    crate_features = [
-    ],
-    build_script_env = {
-    },
-    data = glob(["**"]),
     tags = [
         "cargo-raze",
         "manual",
     ],
     version = "1.6.0",
     visibility = ["//visibility:private"],
+    deps = [
+        "@raze__autocfg__1_0_1//:autocfg",
+    ],
 )
 
 # Unsupported target "bench" with type "bench" omitted
-# Unsupported target "equivalent_trait" with type "test" omitted
+
 # Unsupported target "faststring" with type "bench" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "indexmap",
-    crate_type = "lib",
-    deps = [
-        ":indexmap_build_script",
-        "@raze__hashbrown__0_9_1//:hashbrown",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "1.6.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "1.6.0",
+    # buildifier: leave-alone
+    deps = [
+        ":indexmap_build_script",
+        "@raze__hashbrown__0_9_1//:hashbrown",
     ],
 )
+
+# Unsupported target "equivalent_trait" with type "test" omitted
+
 # Unsupported target "macros_full_path" with type "test" omitted
+
 # Unsupported target "quick" with type "test" omitted
+
 # Unsupported target "tests" with type "test" omitted
diff --git a/cargo/remote/indoc-0.3.6.BUILD.bazel b/cargo/remote/BUILD.indoc-0.3.6.bazel
similarity index 95%
rename from cargo/remote/indoc-0.3.6.BUILD.bazel
rename to cargo/remote/BUILD.indoc-0.3.6.bazel
index 6aca8acea..1068d3dc2 100644
--- a/cargo/remote/indoc-0.3.6.BUILD.bazel
+++ b/cargo/remote/BUILD.indoc-0.3.6.bazel
@@ -28,17 +28,15 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# Unsupported target "compiletest" with type "test" omitted
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "indoc",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     proc_macro_deps = [
         "@raze__indoc_impl__0_3_6//:indoc_impl",
@@ -47,12 +45,16 @@ rust_library(
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.3.6",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.3.6",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
+
+# Unsupported target "compiletest" with type "test" omitted
+
 # Unsupported target "run-pass" with type "test" omitted
diff --git a/cargo/remote/indoc-impl-0.3.6.BUILD.bazel b/cargo/remote/BUILD.indoc-impl-0.3.6.bazel
similarity index 96%
rename from cargo/remote/indoc-impl-0.3.6.BUILD.bazel
rename to cargo/remote/BUILD.indoc-impl-0.3.6.bazel
index 0f3b7c14e..657bca5f7 100644
--- a/cargo/remote/indoc-impl-0.3.6.BUILD.bazel
+++ b/cargo/remote/BUILD.indoc-impl-0.3.6.bazel
@@ -28,20 +28,15 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "indoc_impl",
-    crate_type = "proc-macro",
-    deps = [
-        "@raze__proc_macro2__1_0_24//:proc_macro2",
-        "@raze__quote__1_0_7//:quote",
-        "@raze__syn__1_0_48//:syn",
-        "@raze__unindent__0_1_7//:unindent",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "proc-macro",
     edition = "2018",
     proc_macro_deps = [
         "@raze__proc_macro_hack__0_5_19//:proc_macro_hack",
@@ -49,11 +44,16 @@ rust_library(
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.3.6",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.3.6",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__proc_macro2__1_0_24//:proc_macro2",
+        "@raze__quote__1_0_7//:quote",
+        "@raze__syn__1_0_48//:syn",
+        "@raze__unindent__0_1_7//:unindent",
     ],
 )
diff --git a/cargo/remote/instant-0.1.8.BUILD.bazel b/cargo/remote/BUILD.instant-0.1.8.bazel
similarity index 95%
rename from cargo/remote/instant-0.1.8.BUILD.bazel
rename to cargo/remote/BUILD.instant-0.1.8.bazel
index 16258129c..0bd2e9cea 100644
--- a/cargo/remote/instant-0.1.8.BUILD.bazel
+++ b/cargo/remote/BUILD.instant-0.1.8.bazel
@@ -28,27 +28,28 @@ licenses([
     "notice",  # BSD-3-Clause from expression "BSD-3-Clause"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "instant",
-    crate_type = "lib",
-    deps = [
-        "@raze__cfg_if__1_0_0//:cfg_if",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.1.8",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.1.8",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__cfg_if__1_0_0//:cfg_if",
     ],
 )
+
 # Unsupported target "wasm" with type "test" omitted
diff --git a/cargo/remote/intl-memoizer-0.5.0.BUILD.bazel b/cargo/remote/BUILD.intl-memoizer-0.5.0.bazel
similarity index 95%
rename from cargo/remote/intl-memoizer-0.5.0.BUILD.bazel
rename to cargo/remote/BUILD.intl-memoizer-0.5.0.bazel
index f4a915ef8..142edd285 100644
--- a/cargo/remote/intl-memoizer-0.5.0.BUILD.bazel
+++ b/cargo/remote/BUILD.intl-memoizer-0.5.0.bazel
@@ -28,27 +28,27 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0 OR MIT"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "intl_memoizer",
-    crate_type = "lib",
-    deps = [
-        "@raze__type_map__0_3_0//:type_map",
-        "@raze__unic_langid__0_9_0//:unic_langid",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.5.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.5.0",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__type_map__0_3_0//:type_map",
+        "@raze__unic_langid__0_9_0//:unic_langid",
     ],
 )
diff --git a/cargo/remote/intl_pluralrules-7.0.0.BUILD.bazel b/cargo/remote/BUILD.intl_pluralrules-7.0.0.bazel
similarity index 95%
rename from cargo/remote/intl_pluralrules-7.0.0.BUILD.bazel
rename to cargo/remote/BUILD.intl_pluralrules-7.0.0.bazel
index 92e52699b..381abc768 100644
--- a/cargo/remote/intl_pluralrules-7.0.0.BUILD.bazel
+++ b/cargo/remote/BUILD.intl_pluralrules-7.0.0.bazel
@@ -28,28 +28,29 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0 OR MIT"
 ])
 
-# Generated targets
+# Generated Targets
+
+# Unsupported target "pluralrules" with type "bench" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "intl_pluralrules",
-    crate_type = "lib",
-    deps = [
-        "@raze__tinystr__0_3_4//:tinystr",
-        "@raze__unic_langid__0_9_0//:unic_langid",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "7.0.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "7.0.0",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__tinystr__0_3_4//:tinystr",
+        "@raze__unic_langid__0_9_0//:unic_langid",
     ],
 )
-# Unsupported target "pluralrules" with type "bench" omitted
diff --git a/cargo/remote/inventory-0.1.9.BUILD.bazel b/cargo/remote/BUILD.inventory-0.1.9.bazel
similarity index 94%
rename from cargo/remote/inventory-0.1.9.BUILD.bazel
rename to cargo/remote/BUILD.inventory-0.1.9.bazel
index 373b91caa..5c8bdcb28 100644
--- a/cargo/remote/inventory-0.1.9.BUILD.bazel
+++ b/cargo/remote/BUILD.inventory-0.1.9.bazel
@@ -28,48 +28,44 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "inventory_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build.rs",
-    edition = "2018",
-    deps = [
+    build_script_env = {
+    },
+    crate_features = [
     ],
+    crate_root = "build.rs",
+    data = glob(["**"]),
+    edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    crate_features = [
-    ],
-    build_script_env = {
-    },
-    data = glob(["**"]),
     tags = [
         "cargo-raze",
         "manual",
     ],
     version = "0.1.9",
     visibility = ["//visibility:private"],
+    deps = [
+    ],
 )
 
 # Unsupported target "flags" with type "example" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "inventory",
-    crate_type = "lib",
-    deps = [
-        ":inventory_build_script",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     proc_macro_deps = [
         "@raze__ctor__0_1_16//:ctor",
@@ -79,11 +75,13 @@ rust_library(
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.1.9",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.1.9",
+    # buildifier: leave-alone
+    deps = [
+        ":inventory_build_script",
     ],
 )
diff --git a/cargo/remote/inventory-impl-0.1.9.BUILD.bazel b/cargo/remote/BUILD.inventory-impl-0.1.9.bazel
similarity index 95%
rename from cargo/remote/inventory-impl-0.1.9.BUILD.bazel
rename to cargo/remote/BUILD.inventory-impl-0.1.9.bazel
index bab6bc454..2402c3b9f 100644
--- a/cargo/remote/inventory-impl-0.1.9.BUILD.bazel
+++ b/cargo/remote/BUILD.inventory-impl-0.1.9.bazel
@@ -28,28 +28,28 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "inventory_impl",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "proc-macro",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.1.9",
+    # buildifier: leave-alone
     deps = [
         "@raze__proc_macro2__1_0_24//:proc_macro2",
         "@raze__quote__1_0_7//:quote",
         "@raze__syn__1_0_48//:syn",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.1.9",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-    ],
 )
diff --git a/cargo/remote/iovec-0.1.4.BUILD.bazel b/cargo/remote/BUILD.iovec-0.1.4.bazel
similarity index 96%
rename from cargo/remote/iovec-0.1.4.BUILD.bazel
rename to cargo/remote/BUILD.iovec-0.1.4.bazel
index fe3840e5f..8824d5d68 100644
--- a/cargo/remote/iovec-0.1.4.BUILD.bazel
+++ b/cargo/remote/BUILD.iovec-0.1.4.bazel
@@ -28,12 +28,27 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "iovec",
+    srcs = glob(["**/*.rs"]),
+    aliases = {
+    },
+    crate_features = [
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.1.4",
+    # buildifier: leave-alone
     deps = [
     ] + selects.with_or({
         # cfg(unix)
@@ -49,19 +64,4 @@ rust_library(
         ],
         "//conditions:default": [],
     }),
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.1.4",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-    ],
-    aliases = {
-    },
 )
diff --git a/cargo/remote/ipnet-2.3.0.BUILD.bazel b/cargo/remote/BUILD.ipnet-2.3.0.bazel
similarity index 95%
rename from cargo/remote/ipnet-2.3.0.BUILD.bazel
rename to cargo/remote/BUILD.ipnet-2.3.0.bazel
index 0aae854ac..fae9c8e74 100644
--- a/cargo/remote/ipnet-2.3.0.BUILD.bazel
+++ b/cargo/remote/BUILD.ipnet-2.3.0.bazel
@@ -28,25 +28,25 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "ipnet",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "2.3.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "2.3.0",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
diff --git a/cargo/remote/itertools-0.9.0.BUILD.bazel b/cargo/remote/BUILD.itertools-0.9.0.bazel
similarity index 96%
rename from cargo/remote/itertools-0.9.0.BUILD.bazel
rename to cargo/remote/BUILD.itertools-0.9.0.bazel
index 7936b4003..77f865863 100644
--- a/cargo/remote/itertools-0.9.0.BUILD.bazel
+++ b/cargo/remote/BUILD.itertools-0.9.0.bazel
@@ -28,45 +28,62 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# Unsupported target "adaptors_no_collect" with type "test" omitted
+# Generated Targets
+
 # Unsupported target "bench1" with type "bench" omitted
+
 # Unsupported target "combinations_with_replacement" with type "bench" omitted
+
 # Unsupported target "fold_specialization" with type "bench" omitted
-# Unsupported target "fold_specialization" with type "test" omitted
+
+# Unsupported target "tree_fold1" with type "bench" omitted
+
+# Unsupported target "tuple_combinations" with type "bench" omitted
+
+# Unsupported target "tuples" with type "bench" omitted
+
 # Unsupported target "iris" with type "example" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "itertools",
-    crate_type = "lib",
-    deps = [
-        "@raze__either__1_6_1//:either",
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.9.0",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "default",
         "use_std",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.9.0",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__either__1_6_1//:either",
+    ],
 )
+
+# Unsupported target "adaptors_no_collect" with type "test" omitted
+
+# Unsupported target "fold_specialization" with type "test" omitted
+
 # Unsupported target "merge_join" with type "test" omitted
+
 # Unsupported target "peeking_take_while" with type "test" omitted
+
 # Unsupported target "quick" with type "test" omitted
+
 # Unsupported target "specializations" with type "test" omitted
+
 # Unsupported target "test_core" with type "test" omitted
+
 # Unsupported target "test_std" with type "test" omitted
-# Unsupported target "tree_fold1" with type "bench" omitted
-# Unsupported target "tuple_combinations" with type "bench" omitted
-# Unsupported target "tuples" with type "bench" omitted
+
 # Unsupported target "tuples" with type "test" omitted
+
 # Unsupported target "zip" with type "test" omitted
diff --git a/cargo/remote/itoa-0.4.6.BUILD.bazel b/cargo/remote/BUILD.itoa-0.4.6.bazel
similarity index 95%
rename from cargo/remote/itoa-0.4.6.BUILD.bazel
rename to cargo/remote/BUILD.itoa-0.4.6.bazel
index 83d87932b..f66a5a46d 100644
--- a/cargo/remote/itoa-0.4.6.BUILD.bazel
+++ b/cargo/remote/BUILD.itoa-0.4.6.bazel
@@ -28,30 +28,32 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "bench" with type "bench" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "itoa",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.4.6",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "default",
         "i128",
         "std",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.4.6",
+    # buildifier: leave-alone
+    deps = [
+    ],
 )
+
 # Unsupported target "test" with type "test" omitted
diff --git a/cargo/remote/js-sys-0.3.45.BUILD.bazel b/cargo/remote/BUILD.js-sys-0.3.45.bazel
similarity index 95%
rename from cargo/remote/js-sys-0.3.45.BUILD.bazel
rename to cargo/remote/BUILD.js-sys-0.3.45.bazel
index 6aa980368..bf47eedb9 100644
--- a/cargo/remote/js-sys-0.3.45.BUILD.bazel
+++ b/cargo/remote/BUILD.js-sys-0.3.45.bazel
@@ -28,28 +28,30 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# Unsupported target "headless" with type "test" omitted
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "js_sys",
-    crate_type = "lib",
-    deps = [
-        "@raze__wasm_bindgen__0_2_68//:wasm_bindgen",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.3.45",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.3.45",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__wasm_bindgen__0_2_68//:wasm_bindgen",
     ],
 )
+
+# Unsupported target "headless" with type "test" omitted
+
 # Unsupported target "wasm" with type "test" omitted
diff --git a/cargo/remote/kernel32-sys-0.2.2.BUILD.bazel b/cargo/remote/BUILD.kernel32-sys-0.2.2.bazel
similarity index 94%
rename from cargo/remote/kernel32-sys-0.2.2.BUILD.bazel
rename to cargo/remote/BUILD.kernel32-sys-0.2.2.bazel
index 42848892b..05b673b44 100644
--- a/cargo/remote/kernel32-sys-0.2.2.BUILD.bazel
+++ b/cargo/remote/BUILD.kernel32-sys-0.2.2.bazel
@@ -28,39 +28,36 @@ licenses([
     "notice",  # MIT from expression "MIT"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "kernel32_sys_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build.rs",
-    edition = "2015",
-    deps = [
-        "@raze__winapi_build__0_1_1//:winapi_build",
+    build_script_env = {
+    },
+    crate_features = [
     ],
+    crate_root = "build.rs",
+    data = glob(["**"]),
+    edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    crate_features = [
-    ],
-    build_script_env = {
-    },
-    data = glob(["**"]),
     tags = [
         "cargo-raze",
         "manual",
     ],
     version = "0.2.2",
     visibility = ["//visibility:private"],
+    deps = [
+        "@raze__winapi_build__0_1_1//:winapi_build",
+    ],
 )
 
-
 alias(
     name = "kernel32_sys",
     actual = ":kernel32",
@@ -70,25 +67,25 @@ alias(
     ],
 )
 
-# buildifier: leave-alone
 rust_library(
     name = "kernel32",
-    crate_type = "lib",
-    deps = [
-        ":kernel32_sys_build_script",
-        "@raze__winapi__0_2_8//:winapi",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.2.2",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.2.2",
+    # buildifier: leave-alone
+    deps = [
+        ":kernel32_sys_build_script",
+        "@raze__winapi__0_2_8//:winapi",
     ],
 )
diff --git a/cargo/remote/lazy_static-1.4.0.BUILD.bazel b/cargo/remote/BUILD.lazy_static-1.4.0.bazel
similarity index 95%
rename from cargo/remote/lazy_static-1.4.0.BUILD.bazel
rename to cargo/remote/BUILD.lazy_static-1.4.0.bazel
index 9a223beb3..2eeed058e 100644
--- a/cargo/remote/lazy_static-1.4.0.BUILD.bazel
+++ b/cargo/remote/BUILD.lazy_static-1.4.0.bazel
@@ -28,27 +28,29 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "lazy_static",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "1.4.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "1.4.0",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
+
 # Unsupported target "no_std" with type "test" omitted
+
 # Unsupported target "test" with type "test" omitted
diff --git a/cargo/remote/lexical-core-0.7.4.BUILD.bazel b/cargo/remote/BUILD.lexical-core-0.7.4.bazel
similarity index 89%
rename from cargo/remote/lexical-core-0.7.4.BUILD.bazel
rename to cargo/remote/BUILD.lexical-core-0.7.4.bazel
index 103498ffd..e9b0e8bae 100644
--- a/cargo/remote/lexical-core-0.7.4.BUILD.bazel
+++ b/cargo/remote/BUILD.lexical-core-0.7.4.bazel
@@ -28,68 +28,17 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "lexical_core_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build.rs",
-    edition = "2018",
-    deps = [
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    crate_features = [
-      "arrayvec",
-      "correct",
-      "default",
-      "ryu",
-      "static_assertions",
-      "std",
-      "table",
-    ],
     build_script_env = {
     },
-    data = glob(["**"]),
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    version = "0.7.4",
-    visibility = ["//visibility:private"],
-)
-
-
-# buildifier: leave-alone
-rust_library(
-    name = "lexical_core",
-    crate_type = "lib",
-    deps = [
-        ":lexical_core_build_script",
-        "@raze__arrayvec__0_5_2//:arrayvec",
-        "@raze__bitflags__1_2_1//:bitflags",
-        "@raze__cfg_if__0_1_10//:cfg_if",
-        "@raze__ryu__1_0_5//:ryu",
-        "@raze__static_assertions__1_1_0//:static_assertions",
-    ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.7.4",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "arrayvec",
         "correct",
@@ -99,4 +48,52 @@ rust_library(
         "std",
         "table",
     ],
+    crate_root = "build.rs",
+    data = glob(["**"]),
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.7.4",
+    visibility = ["//visibility:private"],
+    deps = [
+    ],
+)
+
+rust_library(
+    name = "lexical_core",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "arrayvec",
+        "correct",
+        "default",
+        "ryu",
+        "static_assertions",
+        "std",
+        "table",
+    ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.7.4",
+    # buildifier: leave-alone
+    deps = [
+        ":lexical_core_build_script",
+        "@raze__arrayvec__0_5_2//:arrayvec",
+        "@raze__bitflags__1_2_1//:bitflags",
+        "@raze__cfg_if__0_1_10//:cfg_if",
+        "@raze__ryu__1_0_5//:ryu",
+        "@raze__static_assertions__1_1_0//:static_assertions",
+    ],
 )
diff --git a/cargo/remote/libc-0.2.80.BUILD.bazel b/cargo/remote/BUILD.libc-0.2.80.bazel
similarity index 92%
rename from cargo/remote/libc-0.2.80.BUILD.bazel
rename to cargo/remote/BUILD.libc-0.2.80.bazel
index e74461404..c7c411e58 100644
--- a/cargo/remote/libc-0.2.80.BUILD.bazel
+++ b/cargo/remote/BUILD.libc-0.2.80.bazel
@@ -28,61 +28,59 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "libc_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build.rs",
-    edition = "2015",
-    deps = [
+    build_script_env = {
+    },
+    crate_features = [
+        "default",
+        "std",
     ],
+    crate_root = "build.rs",
+    data = glob(["**"]),
+    edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    crate_features = [
-      "default",
-      "std",
-    ],
-    build_script_env = {
-    },
-    data = glob(["**"]),
     tags = [
         "cargo-raze",
         "manual",
     ],
     version = "0.2.80",
     visibility = ["//visibility:private"],
+    deps = [
+    ],
 )
 
-# Unsupported target "const_fn" with type "test" omitted
-
-# buildifier: leave-alone
 rust_library(
     name = "libc",
-    crate_type = "lib",
-    deps = [
-        ":libc_build_script",
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.2.80",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "default",
         "std",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.2.80",
+    # buildifier: leave-alone
+    deps = [
+        ":libc_build_script",
+    ],
 )
+
+# Unsupported target "const_fn" with type "test" omitted
diff --git a/cargo/remote/libsqlite3-sys-0.20.1.BUILD.bazel b/cargo/remote/BUILD.libsqlite3-sys-0.20.1.bazel
similarity index 87%
rename from cargo/remote/libsqlite3-sys-0.20.1.BUILD.bazel
rename to cargo/remote/BUILD.libsqlite3-sys-0.20.1.bazel
index c92a12867..d450a9f9d 100644
--- a/cargo/remote/libsqlite3-sys-0.20.1.BUILD.bazel
+++ b/cargo/remote/BUILD.libsqlite3-sys-0.20.1.bazel
@@ -28,84 +28,17 @@ licenses([
     "notice",  # MIT from expression "MIT"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "libsqlite3_sys_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build.rs",
-    edition = "2018",
-    deps = [
-        "@raze__cc__1_0_61//:cc",
-        "@raze__pkg_config__0_3_19//:pkg_config",
-    ] + selects.with_or({
-        # cfg(target_env = "msvc")
-        (
-            "@io_bazel_rules_rust//rust/platform:i686-pc-windows-msvc",
-            "@io_bazel_rules_rust//rust/platform:x86_64-pc-windows-msvc",
-        ): [
-            "@raze__vcpkg__0_2_10//:vcpkg",
-        ],
-        "//conditions:default": [],
-    }),
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    crate_features = [
-      "bundled",
-      "bundled_bindings",
-      "cc",
-      "default",
-      "min_sqlite_version_3_6_23",
-      "min_sqlite_version_3_6_8",
-      "min_sqlite_version_3_7_7",
-      "pkg-config",
-      "vcpkg",
-    ],
     build_script_env = {
     },
-    data = glob(["**"]),
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    version = "0.20.1",
-    visibility = ["//visibility:private"],
-)
-
-
-# buildifier: leave-alone
-rust_library(
-    name = "libsqlite3_sys",
-    crate_type = "lib",
-    deps = [
-        ":libsqlite3_sys_build_script",
-    ] + selects.with_or({
-        # cfg(target_env = "msvc")
-        (
-            "@io_bazel_rules_rust//rust/platform:i686-pc-windows-msvc",
-            "@io_bazel_rules_rust//rust/platform:x86_64-pc-windows-msvc",
-        ): [
-        ],
-        "//conditions:default": [],
-    }),
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.20.1",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "bundled",
         "bundled_bindings",
@@ -117,6 +50,70 @@ rust_library(
         "pkg-config",
         "vcpkg",
     ],
+    crate_root = "build.rs",
+    data = glob(["**"]),
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.20.1",
+    visibility = ["//visibility:private"],
+    deps = [
+        "@raze__cc__1_0_62//:cc",
+        "@raze__pkg_config__0_3_19//:pkg_config",
+    ] + selects.with_or({
+        # cfg(target_env = "msvc")
+        (
+            "@io_bazel_rules_rust//rust/platform:i686-pc-windows-msvc",
+            "@io_bazel_rules_rust//rust/platform:x86_64-pc-windows-msvc",
+        ): [
+            "@raze__vcpkg__0_2_10//:vcpkg",
+        ],
+        "//conditions:default": [],
+    }),
+)
+
+rust_library(
+    name = "libsqlite3_sys",
+    srcs = glob(["**/*.rs"]),
     aliases = {
     },
+    crate_features = [
+        "bundled",
+        "bundled_bindings",
+        "cc",
+        "default",
+        "min_sqlite_version_3_6_23",
+        "min_sqlite_version_3_6_8",
+        "min_sqlite_version_3_7_7",
+        "pkg-config",
+        "vcpkg",
+    ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.20.1",
+    # buildifier: leave-alone
+    deps = [
+        ":libsqlite3_sys_build_script",
+    ] + selects.with_or({
+        # cfg(target_env = "msvc")
+        (
+            "@io_bazel_rules_rust//rust/platform:i686-pc-windows-msvc",
+            "@io_bazel_rules_rust//rust/platform:x86_64-pc-windows-msvc",
+        ): [
+        ],
+        "//conditions:default": [],
+    }),
 )
diff --git a/cargo/remote/lock_api-0.4.1.BUILD.bazel b/cargo/remote/BUILD.lock_api-0.4.1.bazel
similarity index 95%
rename from cargo/remote/lock_api-0.4.1.BUILD.bazel
rename to cargo/remote/BUILD.lock_api-0.4.1.bazel
index 985f188af..1dfda7386 100644
--- a/cargo/remote/lock_api-0.4.1.BUILD.bazel
+++ b/cargo/remote/BUILD.lock_api-0.4.1.bazel
@@ -28,26 +28,26 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0 OR MIT"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "lock_api",
-    crate_type = "lib",
-    deps = [
-        "@raze__scopeguard__1_1_0//:scopeguard",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.4.1",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.4.1",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__scopeguard__1_1_0//:scopeguard",
     ],
 )
diff --git a/cargo/remote/log-0.4.11.BUILD.bazel b/cargo/remote/BUILD.log-0.4.11.bazel
similarity index 93%
rename from cargo/remote/log-0.4.11.BUILD.bazel
rename to cargo/remote/BUILD.log-0.4.11.bazel
index 21676e9e6..986593358 100644
--- a/cargo/remote/log-0.4.11.BUILD.bazel
+++ b/cargo/remote/BUILD.log-0.4.11.bazel
@@ -28,61 +28,60 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "log_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build.rs",
-    edition = "2015",
-    deps = [
+    build_script_env = {
+    },
+    crate_features = [
+        "std",
     ],
+    crate_root = "build.rs",
+    data = glob(["**"]),
+    edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    crate_features = [
-      "std",
-    ],
-    build_script_env = {
-    },
-    data = glob(["**"]),
     tags = [
         "cargo-raze",
         "manual",
     ],
     version = "0.4.11",
     visibility = ["//visibility:private"],
+    deps = [
+    ],
 )
 
-# Unsupported target "filters" with type "test" omitted
-
-# buildifier: leave-alone
 rust_library(
     name = "log",
-    crate_type = "lib",
-    deps = [
-        ":log_build_script",
-        "@raze__cfg_if__0_1_10//:cfg_if",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "std",
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.4.11",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
-        "std",
+    version = "0.4.11",
+    # buildifier: leave-alone
+    deps = [
+        ":log_build_script",
+        "@raze__cfg_if__0_1_10//:cfg_if",
     ],
 )
+
+# Unsupported target "filters" with type "test" omitted
+
 # Unsupported target "macros" with type "test" omitted
diff --git a/cargo/remote/matches-0.1.8.BUILD.bazel b/cargo/remote/BUILD.matches-0.1.8.bazel
similarity index 95%
rename from cargo/remote/matches-0.1.8.BUILD.bazel
rename to cargo/remote/BUILD.matches-0.1.8.bazel
index 705ed6a03..a8536eb28 100644
--- a/cargo/remote/matches-0.1.8.BUILD.bazel
+++ b/cargo/remote/BUILD.matches-0.1.8.bazel
@@ -28,26 +28,27 @@ licenses([
     "notice",  # MIT from expression "MIT"
 ])
 
-# Generated targets
-# Unsupported target "macro_use_one" with type "test" omitted
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "matches",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.1.8",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.1.8",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
+
+# Unsupported target "macro_use_one" with type "test" omitted
diff --git a/cargo/remote/maybe-uninit-2.0.0.BUILD.bazel b/cargo/remote/BUILD.maybe-uninit-2.0.0.bazel
similarity index 93%
rename from cargo/remote/maybe-uninit-2.0.0.BUILD.bazel
rename to cargo/remote/BUILD.maybe-uninit-2.0.0.bazel
index 208b3e7ff..69618acc8 100644
--- a/cargo/remote/maybe-uninit-2.0.0.BUILD.bazel
+++ b/cargo/remote/BUILD.maybe-uninit-2.0.0.bazel
@@ -28,57 +28,55 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0 OR MIT"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "maybe_uninit_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build.rs",
-    edition = "2015",
-    deps = [
+    build_script_env = {
+    },
+    crate_features = [
     ],
+    crate_root = "build.rs",
+    data = glob(["**"]),
+    edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    crate_features = [
-    ],
-    build_script_env = {
-    },
-    data = glob(["**"]),
     tags = [
         "cargo-raze",
         "manual",
     ],
     version = "2.0.0",
     visibility = ["//visibility:private"],
+    deps = [
+    ],
 )
 
-# Unsupported target "doesnt_drop" with type "test" omitted
-
-# buildifier: leave-alone
 rust_library(
     name = "maybe_uninit",
-    crate_type = "lib",
-    deps = [
-        ":maybe_uninit_build_script",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "2.0.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "2.0.0",
+    # buildifier: leave-alone
+    deps = [
+        ":maybe_uninit_build_script",
     ],
 )
+
+# Unsupported target "doesnt_drop" with type "test" omitted
diff --git a/cargo/remote/memchr-2.3.4.BUILD.bazel b/cargo/remote/BUILD.memchr-2.3.4.bazel
similarity index 91%
rename from cargo/remote/memchr-2.3.4.BUILD.bazel
rename to cargo/remote/BUILD.memchr-2.3.4.bazel
index 5c9171d7d..8c204324a 100644
--- a/cargo/remote/memchr-2.3.4.BUILD.bazel
+++ b/cargo/remote/BUILD.memchr-2.3.4.bazel
@@ -28,62 +28,59 @@ licenses([
     "unencumbered",  # Unlicense from expression "Unlicense OR MIT"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "memchr_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build.rs",
-    edition = "2015",
-    deps = [
+    build_script_env = {
+    },
+    crate_features = [
+        "default",
+        "std",
+        "use_std",
     ],
+    crate_root = "build.rs",
+    data = glob(["**"]),
+    edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    crate_features = [
-      "default",
-      "std",
-      "use_std",
-    ],
-    build_script_env = {
-    },
-    data = glob(["**"]),
     tags = [
         "cargo-raze",
         "manual",
     ],
     version = "2.3.4",
     visibility = ["//visibility:private"],
+    deps = [
+    ],
 )
 
-
-# buildifier: leave-alone
 rust_library(
     name = "memchr",
-    crate_type = "lib",
-    deps = [
-        ":memchr_build_script",
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "2.3.4",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "default",
         "std",
         "use_std",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "2.3.4",
+    # buildifier: leave-alone
+    deps = [
+        ":memchr_build_script",
+    ],
 )
diff --git a/cargo/remote/mime-0.3.16.BUILD.bazel b/cargo/remote/BUILD.mime-0.3.16.bazel
similarity index 95%
rename from cargo/remote/mime-0.3.16.BUILD.bazel
rename to cargo/remote/BUILD.mime-0.3.16.bazel
index 06f35c424..c0586d67f 100644
--- a/cargo/remote/mime-0.3.16.BUILD.bazel
+++ b/cargo/remote/BUILD.mime-0.3.16.bazel
@@ -28,28 +28,31 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "cmp" with type "bench" omitted
+
 # Unsupported target "fmt" with type "bench" omitted
 
-# buildifier: leave-alone
+# Unsupported target "parse" with type "bench" omitted
+
 rust_library(
     name = "mime",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.3.16",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.3.16",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
-# Unsupported target "parse" with type "bench" omitted
diff --git a/cargo/remote/mime_guess-2.0.3.BUILD.bazel b/cargo/remote/BUILD.mime_guess-2.0.3.bazel
similarity index 92%
rename from cargo/remote/mime_guess-2.0.3.BUILD.bazel
rename to cargo/remote/BUILD.mime_guess-2.0.3.bazel
index 0b18c342e..756071202 100644
--- a/cargo/remote/mime_guess-2.0.3.BUILD.bazel
+++ b/cargo/remote/BUILD.mime_guess-2.0.3.bazel
@@ -28,65 +28,64 @@ licenses([
     "notice",  # MIT from expression "MIT"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "mime_guess_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build.rs",
-    edition = "2015",
-    deps = [
-        "@raze__unicase__2_6_0//:unicase",
+    build_script_env = {
+    },
+    crate_features = [
+        "default",
+        "rev-mappings",
     ],
+    crate_root = "build.rs",
+    data = glob(["**"]),
+    edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    crate_features = [
-      "default",
-      "rev-mappings",
-    ],
-    build_script_env = {
-    },
-    data = glob(["**"]),
     tags = [
         "cargo-raze",
         "manual",
     ],
     version = "2.0.3",
     visibility = ["//visibility:private"],
+    deps = [
+        "@raze__unicase__2_6_0//:unicase",
+    ],
 )
 
 # Unsupported target "benchmark" with type "bench" omitted
 
-# buildifier: leave-alone
+# Unsupported target "rev_map" with type "example" omitted
+
 rust_library(
     name = "mime_guess",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "default",
+        "rev-mappings",
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "2.0.3",
+    # buildifier: leave-alone
     deps = [
         ":mime_guess_build_script",
         "@raze__mime__0_3_16//:mime",
         "@raze__unicase__2_6_0//:unicase",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "2.0.3",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-        "default",
-        "rev-mappings",
-    ],
 )
-# Unsupported target "rev_map" with type "example" omitted
diff --git a/cargo/remote/miniz_oxide-0.4.3.BUILD.bazel b/cargo/remote/BUILD.miniz_oxide-0.4.3.bazel
similarity index 93%
rename from cargo/remote/miniz_oxide-0.4.3.BUILD.bazel
rename to cargo/remote/BUILD.miniz_oxide-0.4.3.bazel
index 1b1d14228..ea5a93526 100644
--- a/cargo/remote/miniz_oxide-0.4.3.BUILD.bazel
+++ b/cargo/remote/BUILD.miniz_oxide-0.4.3.bazel
@@ -28,58 +28,55 @@ licenses([
     "notice",  # MIT from expression "MIT OR (Zlib OR Apache-2.0)"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "miniz_oxide_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build.rs",
-    edition = "2018",
-    deps = [
-        "@raze__autocfg__1_0_1//:autocfg",
+    build_script_env = {
+    },
+    crate_features = [
     ],
+    crate_root = "build.rs",
+    data = glob(["**"]),
+    edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    crate_features = [
-    ],
-    build_script_env = {
-    },
-    data = glob(["**"]),
     tags = [
         "cargo-raze",
         "manual",
     ],
     version = "0.4.3",
     visibility = ["//visibility:private"],
+    deps = [
+        "@raze__autocfg__1_0_1//:autocfg",
+    ],
 )
 
-
-# buildifier: leave-alone
 rust_library(
     name = "miniz_oxide",
-    crate_type = "lib",
-    deps = [
-        ":miniz_oxide_build_script",
-        "@raze__adler__0_2_3//:adler",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.4.3",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.4.3",
+    # buildifier: leave-alone
+    deps = [
+        ":miniz_oxide_build_script",
+        "@raze__adler__0_2_3//:adler",
     ],
 )
diff --git a/cargo/remote/mio-0.6.22.BUILD.bazel b/cargo/remote/BUILD.mio-0.6.22.bazel
similarity index 97%
rename from cargo/remote/mio-0.6.22.BUILD.bazel
rename to cargo/remote/BUILD.mio-0.6.22.bazel
index 6f689143d..fdb58b77f 100644
--- a/cargo/remote/mio-0.6.22.BUILD.bazel
+++ b/cargo/remote/BUILD.mio-0.6.22.bazel
@@ -28,12 +28,29 @@ licenses([
     "notice",  # MIT from expression "MIT"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "mio",
+    srcs = glob(["**/*.rs"]),
+    aliases = {
+    },
+    crate_features = [
+        "default",
+        "with-deprecated",
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.6.22",
+    # buildifier: leave-alone
     deps = [
         "@raze__cfg_if__0_1_10//:cfg_if",
         "@raze__iovec__0_1_4//:iovec",
@@ -65,22 +82,6 @@ rust_library(
         ],
         "//conditions:default": [],
     }),
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.6.22",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-        "default",
-        "with-deprecated",
-    ],
-    aliases = {
-    },
 )
+
 # Unsupported target "test" with type "test" omitted
diff --git a/cargo/remote/miow-0.2.1.BUILD.bazel b/cargo/remote/BUILD.miow-0.2.1.bazel
similarity index 95%
rename from cargo/remote/miow-0.2.1.BUILD.bazel
rename to cargo/remote/BUILD.miow-0.2.1.bazel
index 4032074b9..15ca26e00 100644
--- a/cargo/remote/miow-0.2.1.BUILD.bazel
+++ b/cargo/remote/BUILD.miow-0.2.1.bazel
@@ -28,29 +28,29 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "miow",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.2.1",
+    # buildifier: leave-alone
     deps = [
         "@raze__kernel32_sys__0_2_2//:kernel32_sys",
         "@raze__net2__0_2_35//:net2",
         "@raze__winapi__0_2_8//:winapi",
         "@raze__ws2_32_sys__0_2_1//:ws2_32_sys",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.2.1",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-    ],
 )
diff --git a/cargo/remote/multimap-0.8.2.BUILD.bazel b/cargo/remote/BUILD.multimap-0.8.2.bazel
similarity index 95%
rename from cargo/remote/multimap-0.8.2.BUILD.bazel
rename to cargo/remote/BUILD.multimap-0.8.2.bazel
index 5751fcdb4..120b994bb 100644
--- a/cargo/remote/multimap-0.8.2.BUILD.bazel
+++ b/cargo/remote/BUILD.multimap-0.8.2.bazel
@@ -28,25 +28,25 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "multimap",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.8.2",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.8.2",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
diff --git a/cargo/remote/net2-0.2.35.BUILD.bazel b/cargo/remote/BUILD.net2-0.2.35.bazel
similarity index 97%
rename from cargo/remote/net2-0.2.35.BUILD.bazel
rename to cargo/remote/BUILD.net2-0.2.35.bazel
index 7390be163..1ae03cefc 100644
--- a/cargo/remote/net2-0.2.35.BUILD.bazel
+++ b/cargo/remote/BUILD.net2-0.2.35.bazel
@@ -28,12 +28,29 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "net2",
+    srcs = glob(["**/*.rs"]),
+    aliases = {
+    },
+    crate_features = [
+        "default",
+        "duration",
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.2.35",
+    # buildifier: leave-alone
     deps = [
         "@raze__cfg_if__0_1_10//:cfg_if",
     ] + selects.with_or({
@@ -59,21 +76,4 @@ rust_library(
         ],
         "//conditions:default": [],
     }),
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.2.35",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-        "default",
-        "duration",
-    ],
-    aliases = {
-    },
 )
diff --git a/cargo/remote/nodrop-0.1.14.BUILD.bazel b/cargo/remote/BUILD.nodrop-0.1.14.bazel
similarity index 95%
rename from cargo/remote/nodrop-0.1.14.BUILD.bazel
rename to cargo/remote/BUILD.nodrop-0.1.14.bazel
index 2af4a6ca5..a3509a405 100644
--- a/cargo/remote/nodrop-0.1.14.BUILD.bazel
+++ b/cargo/remote/BUILD.nodrop-0.1.14.bazel
@@ -28,25 +28,25 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "nodrop",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.1.14",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.1.14",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
diff --git a/cargo/remote/nom-5.1.2.BUILD.bazel b/cargo/remote/BUILD.nom-5.1.2.bazel
similarity index 94%
rename from cargo/remote/nom-5.1.2.BUILD.bazel
rename to cargo/remote/BUILD.nom-5.1.2.bazel
index 55bdd3ffb..71f72e0db 100644
--- a/cargo/remote/nom-5.1.2.BUILD.bazel
+++ b/cargo/remote/BUILD.nom-5.1.2.bazel
@@ -28,86 +28,17 @@ licenses([
     "notice",  # MIT from expression "MIT"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "nom_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build.rs",
-    edition = "2018",
-    deps = [
-        "@raze__version_check__0_9_2//:version_check",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    crate_features = [
-      "alloc",
-      "default",
-      "lexical",
-      "lexical-core",
-      "std",
-    ],
     build_script_env = {
     },
-    data = glob(["**"]),
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    version = "5.1.2",
-    visibility = ["//visibility:private"],
-)
-
-# Unsupported target "arithmetic" with type "bench" omitted
-# Unsupported target "arithmetic" with type "test" omitted
-# Unsupported target "arithmetic_ast" with type "test" omitted
-# Unsupported target "blockbuf-arithmetic" with type "test" omitted
-# Unsupported target "css" with type "test" omitted
-# Unsupported target "custom_errors" with type "test" omitted
-# Unsupported target "escaped" with type "test" omitted
-# Unsupported target "float" with type "test" omitted
-# Unsupported target "http" with type "bench" omitted
-# Unsupported target "inference" with type "test" omitted
-# Unsupported target "ini" with type "bench" omitted
-# Unsupported target "ini" with type "test" omitted
-# Unsupported target "ini_complete" with type "bench" omitted
-# Unsupported target "ini_str" with type "bench" omitted
-# Unsupported target "ini_str" with type "test" omitted
-# Unsupported target "issues" with type "test" omitted
-# Unsupported target "json" with type "bench" omitted
-# Unsupported target "json" with type "example" omitted
-# Unsupported target "json" with type "test" omitted
-# Unsupported target "mp4" with type "test" omitted
-# Unsupported target "multiline" with type "test" omitted
-# Unsupported target "named_args" with type "test" omitted
-
-# buildifier: leave-alone
-rust_library(
-    name = "nom",
-    crate_type = "lib",
-    deps = [
-        ":nom_build_script",
-        "@raze__lexical_core__0_7_4//:lexical_core",
-        "@raze__memchr__2_3_4//:memchr",
-    ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "5.1.2",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "alloc",
         "default",
@@ -115,9 +46,102 @@ rust_library(
         "lexical-core",
         "std",
     ],
+    crate_root = "build.rs",
+    data = glob(["**"]),
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "5.1.2",
+    visibility = ["//visibility:private"],
+    deps = [
+        "@raze__version_check__0_9_2//:version_check",
+    ],
 )
-# Unsupported target "overflow" with type "test" omitted
-# Unsupported target "reborrow_fold" with type "test" omitted
+
+# Unsupported target "arithmetic" with type "bench" omitted
+
+# Unsupported target "http" with type "bench" omitted
+
+# Unsupported target "ini" with type "bench" omitted
+
+# Unsupported target "ini_complete" with type "bench" omitted
+
+# Unsupported target "ini_str" with type "bench" omitted
+
+# Unsupported target "json" with type "bench" omitted
+
+# Unsupported target "json" with type "example" omitted
+
 # Unsupported target "s_expression" with type "example" omitted
+
 # Unsupported target "string" with type "example" omitted
+
+rust_library(
+    name = "nom",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "alloc",
+        "default",
+        "lexical",
+        "lexical-core",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "5.1.2",
+    # buildifier: leave-alone
+    deps = [
+        ":nom_build_script",
+        "@raze__lexical_core__0_7_4//:lexical_core",
+        "@raze__memchr__2_3_4//:memchr",
+    ],
+)
+
+# Unsupported target "arithmetic" with type "test" omitted
+
+# Unsupported target "arithmetic_ast" with type "test" omitted
+
+# Unsupported target "blockbuf-arithmetic" with type "test" omitted
+
+# Unsupported target "css" with type "test" omitted
+
+# Unsupported target "custom_errors" with type "test" omitted
+
+# Unsupported target "escaped" with type "test" omitted
+
+# Unsupported target "float" with type "test" omitted
+
+# Unsupported target "inference" with type "test" omitted
+
+# Unsupported target "ini" with type "test" omitted
+
+# Unsupported target "ini_str" with type "test" omitted
+
+# Unsupported target "issues" with type "test" omitted
+
+# Unsupported target "json" with type "test" omitted
+
+# Unsupported target "mp4" with type "test" omitted
+
+# Unsupported target "multiline" with type "test" omitted
+
+# Unsupported target "named_args" with type "test" omitted
+
+# Unsupported target "overflow" with type "test" omitted
+
+# Unsupported target "reborrow_fold" with type "test" omitted
+
 # Unsupported target "test1" with type "test" omitted
diff --git a/cargo/remote/num-format-0.4.0.BUILD.bazel b/cargo/remote/BUILD.num-format-0.4.0.bazel
similarity index 97%
rename from cargo/remote/num-format-0.4.0.BUILD.bazel
rename to cargo/remote/BUILD.num-format-0.4.0.bazel
index 5d65e4cc4..79b538263 100644
--- a/cargo/remote/num-format-0.4.0.BUILD.bazel
+++ b/cargo/remote/BUILD.num-format-0.4.0.bazel
@@ -28,12 +28,29 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "num_format",
+    srcs = glob(["**/*.rs"]),
+    aliases = {
+    },
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.4.0",
+    # buildifier: leave-alone
     deps = [
         "@raze__arrayvec__0_4_12//:arrayvec",
         "@raze__itoa__0_4_6//:itoa",
@@ -58,30 +75,22 @@ rust_library(
         ],
         "//conditions:default": [],
     }),
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.4.0",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-        "default",
-        "std",
-    ],
-    aliases = {
-    },
 )
+
 # Unsupported target "test_errors" with type "test" omitted
+
 # Unsupported target "test_no_bytes_written" with type "test" omitted
+
 # Unsupported target "test_non_zero" with type "test" omitted
+
 # Unsupported target "test_num_bigint" with type "test" omitted
+
 # Unsupported target "test_serialization" with type "test" omitted
+
 # Unsupported target "test_signed" with type "test" omitted
+
 # Unsupported target "test_system_locale_unix" with type "test" omitted
+
 # Unsupported target "test_system_locale_windows" with type "test" omitted
+
 # Unsupported target "test_unsigned" with type "test" omitted
diff --git a/cargo/remote/num-integer-0.1.44.BUILD.bazel b/cargo/remote/BUILD.num-integer-0.1.44.bazel
similarity index 93%
rename from cargo/remote/num-integer-0.1.44.BUILD.bazel
rename to cargo/remote/BUILD.num-integer-0.1.44.bazel
index ad6f27fb6..01b9e0704 100644
--- a/cargo/remote/num-integer-0.1.44.BUILD.bazel
+++ b/cargo/remote/BUILD.num-integer-0.1.44.bazel
@@ -28,67 +28,69 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "num_integer_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build.rs",
-    edition = "2015",
-    deps = [
-        "@raze__autocfg__1_0_1//:autocfg",
+    build_script_env = {
+    },
+    crate_features = [
+        "default",
+        "std",
     ],
+    crate_root = "build.rs",
+    data = glob(["**"]),
+    edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    crate_features = [
-      "default",
-      "std",
-    ],
-    build_script_env = {
-    },
-    data = glob(["**"]),
     tags = [
         "cargo-raze",
         "manual",
     ],
     version = "0.1.44",
     visibility = ["//visibility:private"],
+    deps = [
+        "@raze__autocfg__1_0_1//:autocfg",
+    ],
 )
 
 # Unsupported target "average" with type "bench" omitted
-# Unsupported target "average" with type "test" omitted
+
 # Unsupported target "gcd" with type "bench" omitted
 
-# buildifier: leave-alone
+# Unsupported target "roots" with type "bench" omitted
+
 rust_library(
     name = "num_integer",
-    crate_type = "lib",
-    deps = [
-        ":num_integer_build_script",
-        "@raze__num_traits__0_2_14//:num_traits",
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.1.44",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "default",
         "std",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.1.44",
+    # buildifier: leave-alone
+    deps = [
+        ":num_integer_build_script",
+        "@raze__num_traits__0_2_14//:num_traits",
+    ],
 )
-# Unsupported target "roots" with type "bench" omitted
+
+# Unsupported target "average" with type "test" omitted
+
 # Unsupported target "roots" with type "test" omitted
diff --git a/cargo/remote/num-traits-0.2.14.BUILD.bazel b/cargo/remote/BUILD.num-traits-0.2.14.bazel
similarity index 92%
rename from cargo/remote/num-traits-0.2.14.BUILD.bazel
rename to cargo/remote/BUILD.num-traits-0.2.14.bazel
index 18f598800..355c46376 100644
--- a/cargo/remote/num-traits-0.2.14.BUILD.bazel
+++ b/cargo/remote/BUILD.num-traits-0.2.14.bazel
@@ -28,62 +28,60 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "num_traits_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build.rs",
-    edition = "2015",
-    deps = [
-        "@raze__autocfg__1_0_1//:autocfg",
+    build_script_env = {
+    },
+    crate_features = [
+        "default",
+        "std",
     ],
+    crate_root = "build.rs",
+    data = glob(["**"]),
+    edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    crate_features = [
-      "default",
-      "std",
-    ],
-    build_script_env = {
-    },
-    data = glob(["**"]),
     tags = [
         "cargo-raze",
         "manual",
     ],
     version = "0.2.14",
     visibility = ["//visibility:private"],
+    deps = [
+        "@raze__autocfg__1_0_1//:autocfg",
+    ],
 )
 
-# Unsupported target "cast" with type "test" omitted
-
-# buildifier: leave-alone
 rust_library(
     name = "num_traits",
-    crate_type = "lib",
-    deps = [
-        ":num_traits_build_script",
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.2.14",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "default",
         "std",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.2.14",
+    # buildifier: leave-alone
+    deps = [
+        ":num_traits_build_script",
+    ],
 )
+
+# Unsupported target "cast" with type "test" omitted
diff --git a/cargo/remote/num_cpus-1.13.0.BUILD.bazel b/cargo/remote/BUILD.num_cpus-1.13.0.bazel
similarity index 95%
rename from cargo/remote/num_cpus-1.13.0.BUILD.bazel
rename to cargo/remote/BUILD.num_cpus-1.13.0.bazel
index 993f7deb7..eb2ef06e3 100644
--- a/cargo/remote/num_cpus-1.13.0.BUILD.bazel
+++ b/cargo/remote/BUILD.num_cpus-1.13.0.bazel
@@ -28,27 +28,28 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
+
+# Unsupported target "values" with type "example" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "num_cpus",
-    crate_type = "lib",
-    deps = [
-        "@raze__libc__0_2_80//:libc",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "1.13.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "1.13.0",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__libc__0_2_80//:libc",
     ],
 )
-# Unsupported target "values" with type "example" omitted
diff --git a/cargo/remote/num_enum-0.5.1.BUILD.bazel b/cargo/remote/BUILD.num_enum-0.5.1.bazel
similarity index 96%
rename from cargo/remote/num_enum-0.5.1.BUILD.bazel
rename to cargo/remote/BUILD.num_enum-0.5.1.bazel
index 018507808..c17613160 100644
--- a/cargo/remote/num_enum-0.5.1.BUILD.bazel
+++ b/cargo/remote/BUILD.num_enum-0.5.1.bazel
@@ -28,18 +28,17 @@ licenses([
     "notice",  # BSD-3-Clause from expression "BSD-3-Clause"
 ])
 
-# Generated targets
-# Unsupported target "from_primitive" with type "test" omitted
-# Unsupported target "into_primitive" with type "test" omitted
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "num_enum",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "default",
+        "std",
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     proc_macro_deps = [
         "@raze__derivative__2_1_1//:derivative",
@@ -48,17 +47,24 @@ rust_library(
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.5.1",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
-        "default",
-        "std",
+    version = "0.5.1",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
+
+# Unsupported target "from_primitive" with type "test" omitted
+
+# Unsupported target "into_primitive" with type "test" omitted
+
 # Unsupported target "renamed_num_enum" with type "test" omitted
+
 # Unsupported target "try_build" with type "test" omitted
+
 # Unsupported target "try_from_primitive" with type "test" omitted
+
 # Unsupported target "unsafe_from_primitive" with type "test" omitted
diff --git a/cargo/remote/num_enum_derive-0.5.1.BUILD.bazel b/cargo/remote/BUILD.num_enum_derive-0.5.1.bazel
similarity index 96%
rename from cargo/remote/num_enum_derive-0.5.1.BUILD.bazel
rename to cargo/remote/BUILD.num_enum_derive-0.5.1.bazel
index 98f4c521a..3a1001316 100644
--- a/cargo/remote/num_enum_derive-0.5.1.BUILD.bazel
+++ b/cargo/remote/BUILD.num_enum_derive-0.5.1.bazel
@@ -28,31 +28,31 @@ licenses([
     "notice",  # BSD-3-Clause from expression "BSD-3-Clause"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "num_enum_derive",
-    crate_type = "proc-macro",
-    deps = [
-        "@raze__proc_macro_crate__0_1_5//:proc_macro_crate",
-        "@raze__proc_macro2__1_0_24//:proc_macro2",
-        "@raze__quote__1_0_7//:quote",
-        "@raze__syn__1_0_48//:syn",
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.5.1",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "proc-macro-crate",
         "std",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "proc-macro",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.5.1",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__proc_macro2__1_0_24//:proc_macro2",
+        "@raze__proc_macro_crate__0_1_5//:proc_macro_crate",
+        "@raze__quote__1_0_7//:quote",
+        "@raze__syn__1_0_48//:syn",
+    ],
 )
diff --git a/cargo/remote/object-0.22.0.BUILD.bazel b/cargo/remote/BUILD.object-0.22.0.bazel
similarity index 96%
rename from cargo/remote/object-0.22.0.BUILD.bazel
rename to cargo/remote/BUILD.object-0.22.0.bazel
index f91822139..5f3605ccc 100644
--- a/cargo/remote/object-0.22.0.BUILD.bazel
+++ b/cargo/remote/BUILD.object-0.22.0.bazel
@@ -28,30 +28,21 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0 OR MIT"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "ar" with type "example" omitted
-# Unsupported target "integration" with type "test" omitted
+
 # Unsupported target "nm" with type "example" omitted
+
 # Unsupported target "objcopy" with type "example" omitted
+
 # Unsupported target "objdump" with type "example" omitted
 
-# buildifier: leave-alone
+# Unsupported target "objectmap" with type "example" omitted
+
 rust_library(
     name = "object",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.22.0",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "archive",
         "coff",
@@ -61,6 +52,22 @@ rust_library(
         "read_core",
         "unaligned",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.22.0",
+    # buildifier: leave-alone
+    deps = [
+    ],
 )
-# Unsupported target "objectmap" with type "example" omitted
+
+# Unsupported target "integration" with type "test" omitted
+
 # Unsupported target "parse_self" with type "test" omitted
diff --git a/cargo/remote/once_cell-1.4.1.BUILD.bazel b/cargo/remote/BUILD.once_cell-1.4.1.bazel
similarity index 96%
rename from cargo/remote/once_cell-1.4.1.BUILD.bazel
rename to cargo/remote/BUILD.once_cell-1.4.1.bazel
index e8df211af..bdde03682 100644
--- a/cargo/remote/once_cell-1.4.1.BUILD.bazel
+++ b/cargo/remote/BUILD.once_cell-1.4.1.bazel
@@ -28,35 +28,43 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "bench" with type "example" omitted
+
 # Unsupported target "bench_acquire" with type "example" omitted
+
 # Unsupported target "bench_vs_lazy_static" with type "example" omitted
+
 # Unsupported target "lazy_static" with type "example" omitted
 
-# buildifier: leave-alone
+# Unsupported target "reentrant_init_deadlocks" with type "example" omitted
+
+# Unsupported target "regex" with type "example" omitted
+
+# Unsupported target "test_synchronization" with type "example" omitted
+
 rust_library(
     name = "once_cell",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "1.4.1",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "default",
         "std",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "1.4.1",
+    # buildifier: leave-alone
+    deps = [
+    ],
 )
-# Unsupported target "reentrant_init_deadlocks" with type "example" omitted
-# Unsupported target "regex" with type "example" omitted
+
 # Unsupported target "test" with type "test" omitted
-# Unsupported target "test_synchronization" with type "example" omitted
diff --git a/cargo/remote/openssl-probe-0.1.2.BUILD.bazel b/cargo/remote/BUILD.openssl-probe-0.1.2.bazel
similarity index 95%
rename from cargo/remote/openssl-probe-0.1.2.BUILD.bazel
rename to cargo/remote/BUILD.openssl-probe-0.1.2.bazel
index 3dc0e8b05..ec72d4836 100644
--- a/cargo/remote/openssl-probe-0.1.2.BUILD.bazel
+++ b/cargo/remote/BUILD.openssl-probe-0.1.2.bazel
@@ -28,25 +28,25 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "openssl_probe",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.1.2",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.1.2",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
diff --git a/cargo/remote/parking_lot-0.11.0.BUILD.bazel b/cargo/remote/BUILD.parking_lot-0.11.0.bazel
similarity index 95%
rename from cargo/remote/parking_lot-0.11.0.BUILD.bazel
rename to cargo/remote/BUILD.parking_lot-0.11.0.bazel
index 0e682dcbb..16a636c07 100644
--- a/cargo/remote/parking_lot-0.11.0.BUILD.bazel
+++ b/cargo/remote/BUILD.parking_lot-0.11.0.bazel
@@ -28,30 +28,31 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0 OR MIT"
 ])
 
-# Generated targets
-# Unsupported target "issue_203" with type "test" omitted
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "parking_lot",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "default",
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.11.0",
+    # buildifier: leave-alone
     deps = [
         "@raze__instant__0_1_8//:instant",
         "@raze__lock_api__0_4_1//:lock_api",
         "@raze__parking_lot_core__0_8_0//:parking_lot_core",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.11.0",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-        "default",
-    ],
 )
+
+# Unsupported target "issue_203" with type "test" omitted
diff --git a/cargo/remote/parking_lot_core-0.8.0.BUILD.bazel b/cargo/remote/BUILD.parking_lot_core-0.8.0.bazel
similarity index 97%
rename from cargo/remote/parking_lot_core-0.8.0.BUILD.bazel
rename to cargo/remote/BUILD.parking_lot_core-0.8.0.bazel
index 5456bbfd9..36190936c 100644
--- a/cargo/remote/parking_lot_core-0.8.0.BUILD.bazel
+++ b/cargo/remote/BUILD.parking_lot_core-0.8.0.bazel
@@ -28,12 +28,27 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0 OR MIT"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "parking_lot_core",
+    srcs = glob(["**/*.rs"]),
+    aliases = {
+    },
+    crate_features = [
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.8.0",
+    # buildifier: leave-alone
     deps = [
         "@raze__cfg_if__0_1_10//:cfg_if",
         "@raze__instant__0_1_8//:instant",
@@ -61,19 +76,4 @@ rust_library(
         ],
         "//conditions:default": [],
     }),
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.8.0",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-    ],
-    aliases = {
-    },
 )
diff --git a/cargo/remote/paste-0.1.18.BUILD.bazel b/cargo/remote/BUILD.paste-0.1.18.bazel
similarity index 95%
rename from cargo/remote/paste-0.1.18.BUILD.bazel
rename to cargo/remote/BUILD.paste-0.1.18.bazel
index f21491a45..0b5ae5afc 100644
--- a/cargo/remote/paste-0.1.18.BUILD.bazel
+++ b/cargo/remote/BUILD.paste-0.1.18.bazel
@@ -28,17 +28,15 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# Unsupported target "compiletest" with type "test" omitted
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "paste",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     proc_macro_deps = [
         "@raze__paste_impl__0_1_18//:paste_impl",
@@ -47,12 +45,16 @@ rust_library(
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.1.18",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.1.18",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
+
+# Unsupported target "compiletest" with type "test" omitted
+
 # Unsupported target "test" with type "test" omitted
diff --git a/cargo/remote/paste-impl-0.1.18.BUILD.bazel b/cargo/remote/BUILD.paste-impl-0.1.18.bazel
similarity index 95%
rename from cargo/remote/paste-impl-0.1.18.BUILD.bazel
rename to cargo/remote/BUILD.paste-impl-0.1.18.bazel
index 68e1e7ee0..2ff671fb5 100644
--- a/cargo/remote/paste-impl-0.1.18.BUILD.bazel
+++ b/cargo/remote/BUILD.paste-impl-0.1.18.bazel
@@ -28,16 +28,15 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "paste_impl",
-    crate_type = "proc-macro",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "proc-macro",
     edition = "2018",
     proc_macro_deps = [
         "@raze__proc_macro_hack__0_5_19//:proc_macro_hack",
@@ -45,11 +44,12 @@ rust_library(
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.1.18",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.1.18",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
diff --git a/cargo/remote/percent-encoding-2.1.0.BUILD.bazel b/cargo/remote/BUILD.percent-encoding-2.1.0.bazel
similarity index 95%
rename from cargo/remote/percent-encoding-2.1.0.BUILD.bazel
rename to cargo/remote/BUILD.percent-encoding-2.1.0.bazel
index 74f9a461c..76ec50a91 100644
--- a/cargo/remote/percent-encoding-2.1.0.BUILD.bazel
+++ b/cargo/remote/BUILD.percent-encoding-2.1.0.bazel
@@ -28,25 +28,25 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "percent_encoding",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "2.1.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "2.1.0",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
diff --git a/cargo/remote/petgraph-0.5.1.BUILD.bazel b/cargo/remote/BUILD.petgraph-0.5.1.bazel
similarity index 96%
rename from cargo/remote/petgraph-0.5.1.BUILD.bazel
rename to cargo/remote/BUILD.petgraph-0.5.1.bazel
index 10e5e2d43..15c52e14d 100644
--- a/cargo/remote/petgraph-0.5.1.BUILD.bazel
+++ b/cargo/remote/BUILD.petgraph-0.5.1.bazel
@@ -28,39 +28,51 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "dijkstra" with type "bench" omitted
-# Unsupported target "graph" with type "test" omitted
-# Unsupported target "graphmap" with type "test" omitted
+
 # Unsupported target "iso" with type "bench" omitted
-# Unsupported target "iso" with type "test" omitted
+
 # Unsupported target "matrix_graph" with type "bench" omitted
+
 # Unsupported target "ograph" with type "bench" omitted
 
-# buildifier: leave-alone
+# Unsupported target "stable_graph" with type "bench" omitted
+
+# Unsupported target "unionfind" with type "bench" omitted
+
 rust_library(
     name = "petgraph",
-    crate_type = "lib",
-    deps = [
-        "@raze__fixedbitset__0_2_0//:fixedbitset",
-        "@raze__indexmap__1_6_0//:indexmap",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.5.1",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.5.1",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__fixedbitset__0_2_0//:fixedbitset",
+        "@raze__indexmap__1_6_0//:indexmap",
     ],
 )
+
+# Unsupported target "graph" with type "test" omitted
+
+# Unsupported target "graphmap" with type "test" omitted
+
+# Unsupported target "iso" with type "test" omitted
+
 # Unsupported target "quickcheck" with type "test" omitted
-# Unsupported target "stable_graph" with type "bench" omitted
+
 # Unsupported target "stable_graph" with type "test" omitted
-# Unsupported target "unionfind" with type "bench" omitted
+
 # Unsupported target "unionfind" with type "test" omitted
diff --git a/cargo/remote/pin-project-0.4.27.BUILD.bazel b/cargo/remote/BUILD.pin-project-0.4.27.bazel
similarity index 97%
rename from cargo/remote/pin-project-0.4.27.BUILD.bazel
rename to cargo/remote/BUILD.pin-project-0.4.27.bazel
index 9029a7c32..19e897e2f 100644
--- a/cargo/remote/pin-project-0.4.27.BUILD.bazel
+++ b/cargo/remote/BUILD.pin-project-0.4.27.bazel
@@ -28,24 +28,39 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0 OR MIT"
 ])
 
-# Generated targets
-# Unsupported target "cfg" with type "test" omitted
-# Unsupported target "compiletest" with type "test" omitted
-# Unsupported target "drop_order" with type "test" omitted
+# Generated Targets
+
 # Unsupported target "enum-default" with type "example" omitted
+
 # Unsupported target "enum-default-expanded" with type "example" omitted
-# Unsupported target "lint" with type "test" omitted
+
 # Unsupported target "not_unpin" with type "example" omitted
+
 # Unsupported target "not_unpin-expanded" with type "example" omitted
 
-# buildifier: leave-alone
+# Unsupported target "pinned_drop" with type "example" omitted
+
+# Unsupported target "pinned_drop-expanded" with type "example" omitted
+
+# Unsupported target "project_replace" with type "example" omitted
+
+# Unsupported target "project_replace-expanded" with type "example" omitted
+
+# Unsupported target "struct-default" with type "example" omitted
+
+# Unsupported target "struct-default-expanded" with type "example" omitted
+
+# Unsupported target "unsafe_unpin" with type "example" omitted
+
+# Unsupported target "unsafe_unpin-expanded" with type "example" omitted
+
 rust_library(
     name = "pin_project",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     proc_macro_deps = [
         "@raze__pin_project_internal__0_4_27//:pin_project_internal",
@@ -53,27 +68,36 @@ rust_library(
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.4.27",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.4.27",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
+
+# Unsupported target "cfg" with type "test" omitted
+
+# Unsupported target "compiletest" with type "test" omitted
+
+# Unsupported target "drop_order" with type "test" omitted
+
+# Unsupported target "lint" with type "test" omitted
+
 # Unsupported target "pin_project" with type "test" omitted
-# Unsupported target "pinned_drop" with type "example" omitted
+
 # Unsupported target "pinned_drop" with type "test" omitted
-# Unsupported target "pinned_drop-expanded" with type "example" omitted
+
 # Unsupported target "project" with type "test" omitted
+
 # Unsupported target "project_ref" with type "test" omitted
-# Unsupported target "project_replace" with type "example" omitted
+
 # Unsupported target "project_replace" with type "test" omitted
-# Unsupported target "project_replace-expanded" with type "example" omitted
+
 # Unsupported target "repr_packed" with type "test" omitted
+
 # Unsupported target "sized" with type "test" omitted
-# Unsupported target "struct-default" with type "example" omitted
-# Unsupported target "struct-default-expanded" with type "example" omitted
-# Unsupported target "unsafe_unpin" with type "example" omitted
+
 # Unsupported target "unsafe_unpin" with type "test" omitted
-# Unsupported target "unsafe_unpin-expanded" with type "example" omitted
diff --git a/cargo/remote/pin-project-1.0.1.BUILD.bazel b/cargo/remote/BUILD.pin-project-1.0.1.bazel
similarity index 97%
rename from cargo/remote/pin-project-1.0.1.BUILD.bazel
rename to cargo/remote/BUILD.pin-project-1.0.1.bazel
index efdf596d7..5eff6cb8f 100644
--- a/cargo/remote/pin-project-1.0.1.BUILD.bazel
+++ b/cargo/remote/BUILD.pin-project-1.0.1.bazel
@@ -28,24 +28,39 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0 OR MIT"
 ])
 
-# Generated targets
-# Unsupported target "cfg" with type "test" omitted
-# Unsupported target "compiletest" with type "test" omitted
-# Unsupported target "drop_order" with type "test" omitted
+# Generated Targets
+
 # Unsupported target "enum-default" with type "example" omitted
+
 # Unsupported target "enum-default-expanded" with type "example" omitted
-# Unsupported target "lint" with type "test" omitted
+
 # Unsupported target "not_unpin" with type "example" omitted
+
 # Unsupported target "not_unpin-expanded" with type "example" omitted
 
-# buildifier: leave-alone
+# Unsupported target "pinned_drop" with type "example" omitted
+
+# Unsupported target "pinned_drop-expanded" with type "example" omitted
+
+# Unsupported target "project_replace" with type "example" omitted
+
+# Unsupported target "project_replace-expanded" with type "example" omitted
+
+# Unsupported target "struct-default" with type "example" omitted
+
+# Unsupported target "struct-default-expanded" with type "example" omitted
+
+# Unsupported target "unsafe_unpin" with type "example" omitted
+
+# Unsupported target "unsafe_unpin-expanded" with type "example" omitted
+
 rust_library(
     name = "pin_project",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     proc_macro_deps = [
         "@raze__pin_project_internal__1_0_1//:pin_project_internal",
@@ -53,24 +68,30 @@ rust_library(
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "1.0.1",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "1.0.1",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
+
+# Unsupported target "cfg" with type "test" omitted
+
+# Unsupported target "compiletest" with type "test" omitted
+
+# Unsupported target "drop_order" with type "test" omitted
+
+# Unsupported target "lint" with type "test" omitted
+
 # Unsupported target "pin_project" with type "test" omitted
-# Unsupported target "pinned_drop" with type "example" omitted
+
 # Unsupported target "pinned_drop" with type "test" omitted
-# Unsupported target "pinned_drop-expanded" with type "example" omitted
-# Unsupported target "project_replace" with type "example" omitted
-# Unsupported target "project_replace-expanded" with type "example" omitted
+
 # Unsupported target "proper_unpin" with type "test" omitted
+
 # Unsupported target "repr_packed" with type "test" omitted
-# Unsupported target "struct-default" with type "example" omitted
-# Unsupported target "struct-default-expanded" with type "example" omitted
-# Unsupported target "unsafe_unpin" with type "example" omitted
+
 # Unsupported target "unsafe_unpin" with type "test" omitted
-# Unsupported target "unsafe_unpin-expanded" with type "example" omitted
diff --git a/cargo/remote/pin-project-internal-0.4.27.BUILD.bazel b/cargo/remote/BUILD.pin-project-internal-0.4.27.bazel
similarity index 94%
rename from cargo/remote/pin-project-internal-0.4.27.BUILD.bazel
rename to cargo/remote/BUILD.pin-project-internal-0.4.27.bazel
index 29928ba0a..60046561e 100644
--- a/cargo/remote/pin-project-internal-0.4.27.BUILD.bazel
+++ b/cargo/remote/BUILD.pin-project-internal-0.4.27.bazel
@@ -28,59 +28,56 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0 OR MIT"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "pin_project_internal_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build.rs",
-    edition = "2018",
-    deps = [
+    build_script_env = {
+    },
+    crate_features = [
     ],
+    crate_root = "build.rs",
+    data = glob(["**"]),
+    edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    crate_features = [
-    ],
-    build_script_env = {
-    },
-    data = glob(["**"]),
     tags = [
         "cargo-raze",
         "manual",
     ],
     version = "0.4.27",
     visibility = ["//visibility:private"],
+    deps = [
+    ],
 )
 
-
-# buildifier: leave-alone
 rust_library(
     name = "pin_project_internal",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "proc-macro",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.4.27",
+    # buildifier: leave-alone
     deps = [
         ":pin_project_internal_build_script",
         "@raze__proc_macro2__1_0_24//:proc_macro2",
         "@raze__quote__1_0_7//:quote",
         "@raze__syn__1_0_48//:syn",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.4.27",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-    ],
 )
diff --git a/cargo/remote/pin-project-internal-1.0.1.BUILD.bazel b/cargo/remote/BUILD.pin-project-internal-1.0.1.bazel
similarity index 95%
rename from cargo/remote/pin-project-internal-1.0.1.BUILD.bazel
rename to cargo/remote/BUILD.pin-project-internal-1.0.1.bazel
index 04fee03eb..97c885667 100644
--- a/cargo/remote/pin-project-internal-1.0.1.BUILD.bazel
+++ b/cargo/remote/BUILD.pin-project-internal-1.0.1.bazel
@@ -28,28 +28,28 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0 OR MIT"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "pin_project_internal",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "proc-macro",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "1.0.1",
+    # buildifier: leave-alone
     deps = [
         "@raze__proc_macro2__1_0_24//:proc_macro2",
         "@raze__quote__1_0_7//:quote",
         "@raze__syn__1_0_48//:syn",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "1.0.1",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-    ],
 )
diff --git a/cargo/remote/pin-project-lite-0.1.11.BUILD.bazel b/cargo/remote/BUILD.pin-project-lite-0.1.11.bazel
similarity index 95%
rename from cargo/remote/pin-project-lite-0.1.11.BUILD.bazel
rename to cargo/remote/BUILD.pin-project-lite-0.1.11.bazel
index 5ed17c8ca..cf9bda559 100644
--- a/cargo/remote/pin-project-lite-0.1.11.BUILD.bazel
+++ b/cargo/remote/BUILD.pin-project-lite-0.1.11.bazel
@@ -28,29 +28,33 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0 OR MIT"
 ])
 
-# Generated targets
-# Unsupported target "compiletest" with type "test" omitted
-# Unsupported target "lint" with type "test" omitted
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "pin_project_lite",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.1.11",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.1.11",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
+
+# Unsupported target "compiletest" with type "test" omitted
+
+# Unsupported target "lint" with type "test" omitted
+
 # Unsupported target "proper_unpin" with type "test" omitted
+
 # Unsupported target "test" with type "test" omitted
diff --git a/cargo/remote/pin-utils-0.1.0.BUILD.bazel b/cargo/remote/BUILD.pin-utils-0.1.0.bazel
similarity index 95%
rename from cargo/remote/pin-utils-0.1.0.BUILD.bazel
rename to cargo/remote/BUILD.pin-utils-0.1.0.bazel
index ee3bff5bb..1726b8571 100644
--- a/cargo/remote/pin-utils-0.1.0.BUILD.bazel
+++ b/cargo/remote/BUILD.pin-utils-0.1.0.bazel
@@ -28,27 +28,29 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "pin_utils",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.1.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.1.0",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
+
 # Unsupported target "projection" with type "test" omitted
+
 # Unsupported target "stack_pin" with type "test" omitted
diff --git a/cargo/remote/pkg-config-0.3.19.BUILD.bazel b/cargo/remote/BUILD.pkg-config-0.3.19.bazel
similarity index 95%
rename from cargo/remote/pkg-config-0.3.19.BUILD.bazel
rename to cargo/remote/BUILD.pkg-config-0.3.19.bazel
index fae65f38c..d1999d8c3 100644
--- a/cargo/remote/pkg-config-0.3.19.BUILD.bazel
+++ b/cargo/remote/BUILD.pkg-config-0.3.19.bazel
@@ -28,26 +28,27 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "pkg_config",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.3.19",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.3.19",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
+
 # Unsupported target "test" with type "test" omitted
diff --git a/cargo/remote/podio-0.1.7.BUILD.bazel b/cargo/remote/BUILD.podio-0.1.7.bazel
similarity index 95%
rename from cargo/remote/podio-0.1.7.BUILD.bazel
rename to cargo/remote/BUILD.podio-0.1.7.bazel
index 41d126b74..6e3e56e52 100644
--- a/cargo/remote/podio-0.1.7.BUILD.bazel
+++ b/cargo/remote/BUILD.podio-0.1.7.bazel
@@ -28,28 +28,31 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# Unsupported target "benchmark" with type "bench" omitted
-# Unsupported target "bytes" with type "test" omitted
-# Unsupported target "io" with type "test" omitted
+# Generated Targets
+
+# Unsupported target "benchmark" with type "bench" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "podio",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.1.7",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.1.7",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
+
+# Unsupported target "bytes" with type "test" omitted
+
+# Unsupported target "io" with type "test" omitted
diff --git a/cargo/remote/ppv-lite86-0.2.10.BUILD.bazel b/cargo/remote/BUILD.ppv-lite86-0.2.10.bazel
similarity index 95%
rename from cargo/remote/ppv-lite86-0.2.10.BUILD.bazel
rename to cargo/remote/BUILD.ppv-lite86-0.2.10.bazel
index c45da017e..cd8292f02 100644
--- a/cargo/remote/ppv-lite86-0.2.10.BUILD.bazel
+++ b/cargo/remote/BUILD.ppv-lite86-0.2.10.bazel
@@ -28,27 +28,27 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "ppv_lite86",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.2.10",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "simd",
         "std",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.2.10",
+    # buildifier: leave-alone
+    deps = [
+    ],
 )
diff --git a/cargo/remote/proc-macro-crate-0.1.5.BUILD.bazel b/cargo/remote/BUILD.proc-macro-crate-0.1.5.bazel
similarity index 95%
rename from cargo/remote/proc-macro-crate-0.1.5.BUILD.bazel
rename to cargo/remote/BUILD.proc-macro-crate-0.1.5.bazel
index 1c91362b5..6a9dd1ffc 100644
--- a/cargo/remote/proc-macro-crate-0.1.5.BUILD.bazel
+++ b/cargo/remote/BUILD.proc-macro-crate-0.1.5.bazel
@@ -28,26 +28,26 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0 OR MIT"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "proc_macro_crate",
-    crate_type = "lib",
-    deps = [
-        "@raze__toml__0_5_7//:toml",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.1.5",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.1.5",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__toml__0_5_7//:toml",
     ],
 )
diff --git a/cargo/remote/proc-macro-hack-0.5.19.BUILD.bazel b/cargo/remote/BUILD.proc-macro-hack-0.5.19.bazel
similarity index 93%
rename from cargo/remote/proc-macro-hack-0.5.19.BUILD.bazel
rename to cargo/remote/BUILD.proc-macro-hack-0.5.19.bazel
index 573bf645c..de700e4a0 100644
--- a/cargo/remote/proc-macro-hack-0.5.19.BUILD.bazel
+++ b/cargo/remote/BUILD.proc-macro-hack-0.5.19.bazel
@@ -28,57 +28,55 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "proc_macro_hack_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build.rs",
-    edition = "2018",
-    deps = [
+    build_script_env = {
+    },
+    crate_features = [
     ],
+    crate_root = "build.rs",
+    data = glob(["**"]),
+    edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    crate_features = [
-    ],
-    build_script_env = {
-    },
-    data = glob(["**"]),
     tags = [
         "cargo-raze",
         "manual",
     ],
     version = "0.5.19",
     visibility = ["//visibility:private"],
+    deps = [
+    ],
 )
 
-# Unsupported target "compiletest" with type "test" omitted
-
-# buildifier: leave-alone
 rust_library(
     name = "proc_macro_hack",
-    crate_type = "proc-macro",
-    deps = [
-        ":proc_macro_hack_build_script",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "proc-macro",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.5.19",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.5.19",
+    # buildifier: leave-alone
+    deps = [
+        ":proc_macro_hack_build_script",
     ],
 )
+
+# Unsupported target "compiletest" with type "test" omitted
diff --git a/cargo/remote/proc-macro-nested-0.1.6.BUILD.bazel b/cargo/remote/BUILD.proc-macro-nested-0.1.6.bazel
similarity index 93%
rename from cargo/remote/proc-macro-nested-0.1.6.BUILD.bazel
rename to cargo/remote/BUILD.proc-macro-nested-0.1.6.bazel
index 8e2780f09..a41efd8f1 100644
--- a/cargo/remote/proc-macro-nested-0.1.6.BUILD.bazel
+++ b/cargo/remote/BUILD.proc-macro-nested-0.1.6.bazel
@@ -28,56 +28,53 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "proc_macro_nested_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build.rs",
-    edition = "2015",
-    deps = [
+    build_script_env = {
+    },
+    crate_features = [
     ],
+    crate_root = "build.rs",
+    data = glob(["**"]),
+    edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    crate_features = [
-    ],
-    build_script_env = {
-    },
-    data = glob(["**"]),
     tags = [
         "cargo-raze",
         "manual",
     ],
     version = "0.1.6",
     visibility = ["//visibility:private"],
+    deps = [
+    ],
 )
 
-
-# buildifier: leave-alone
 rust_library(
     name = "proc_macro_nested",
-    crate_type = "lib",
-    deps = [
-        ":proc_macro_nested_build_script",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.1.6",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.1.6",
+    # buildifier: leave-alone
+    deps = [
+        ":proc_macro_nested_build_script",
     ],
 )
diff --git a/cargo/remote/proc-macro2-1.0.24.BUILD.bazel b/cargo/remote/BUILD.proc-macro2-1.0.24.bazel
similarity index 93%
rename from cargo/remote/proc-macro2-1.0.24.BUILD.bazel
rename to cargo/remote/BUILD.proc-macro2-1.0.24.bazel
index ec8330ce3..a47dee6ba 100644
--- a/cargo/remote/proc-macro2-1.0.24.BUILD.bazel
+++ b/cargo/remote/BUILD.proc-macro2-1.0.24.bazel
@@ -28,66 +28,68 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "proc_macro2_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build.rs",
-    edition = "2018",
-    deps = [
+    build_script_env = {
+    },
+    crate_features = [
+        "default",
+        "proc-macro",
     ],
+    crate_root = "build.rs",
+    data = glob(["**"]),
+    edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    crate_features = [
-      "default",
-      "proc-macro",
-    ],
-    build_script_env = {
-    },
-    data = glob(["**"]),
     tags = [
         "cargo-raze",
         "manual",
     ],
     version = "1.0.24",
     visibility = ["//visibility:private"],
+    deps = [
+    ],
 )
 
-# Unsupported target "comments" with type "test" omitted
-# Unsupported target "features" with type "test" omitted
-# Unsupported target "marker" with type "test" omitted
-
-# buildifier: leave-alone
 rust_library(
     name = "proc_macro2",
-    crate_type = "lib",
-    deps = [
-        ":proc_macro2_build_script",
-        "@raze__unicode_xid__0_2_1//:unicode_xid",
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "1.0.24",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "default",
         "proc-macro",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "1.0.24",
+    # buildifier: leave-alone
+    deps = [
+        ":proc_macro2_build_script",
+        "@raze__unicode_xid__0_2_1//:unicode_xid",
+    ],
 )
+
+# Unsupported target "comments" with type "test" omitted
+
+# Unsupported target "features" with type "test" omitted
+
+# Unsupported target "marker" with type "test" omitted
+
 # Unsupported target "test" with type "test" omitted
+
 # Unsupported target "test_fmt" with type "test" omitted
diff --git a/cargo/remote/prost-0.6.1.BUILD.bazel b/cargo/remote/BUILD.prost-0.6.1.bazel
similarity index 95%
rename from cargo/remote/prost-0.6.1.BUILD.bazel
rename to cargo/remote/BUILD.prost-0.6.1.bazel
index 83c2632d6..daa77d2e1 100644
--- a/cargo/remote/prost-0.6.1.BUILD.bazel
+++ b/cargo/remote/BUILD.prost-0.6.1.bazel
@@ -28,17 +28,20 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
+
+# Unsupported target "varint" with type "bench" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "prost",
-    crate_type = "lib",
-    deps = [
-        "@raze__bytes__0_5_6//:bytes",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "default",
+        "prost-derive",
+        "std",
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     proc_macro_deps = [
         "@raze__prost_derive__0_6_1//:prost_derive",
@@ -46,15 +49,13 @@ rust_library(
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.6.1",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
-        "default",
-        "prost-derive",
-        "std",
+    version = "0.6.1",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__bytes__0_5_6//:bytes",
     ],
 )
-# Unsupported target "varint" with type "bench" omitted
diff --git a/cargo/remote/prost-build-0.6.1.BUILD.bazel b/cargo/remote/BUILD.prost-build-0.6.1.bazel
similarity index 94%
rename from cargo/remote/prost-build-0.6.1.BUILD.bazel
rename to cargo/remote/BUILD.prost-build-0.6.1.bazel
index 038469fd5..4ffb88680 100644
--- a/cargo/remote/prost-build-0.6.1.BUILD.bazel
+++ b/cargo/remote/BUILD.prost-build-0.6.1.bazel
@@ -28,43 +28,53 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "prost_build_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "prost-build/build.rs",
-    edition = "2018",
-    deps = [
-        "@raze__which__4_0_2//:which",
+    build_script_env = {
+    },
+    crate_features = [
     ],
+    crate_root = "prost-build/build.rs",
+    data = glob(["**"]),
+    edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    crate_features = [
-    ],
-    build_script_env = {
-    },
-    data = glob(["**"]),
     tags = [
         "cargo-raze",
         "manual",
     ],
     version = "0.6.1",
     visibility = ["//visibility:private"],
+    deps = [
+        "@raze__which__4_0_2//:which",
+    ],
 )
 
-
-# buildifier: leave-alone
 rust_library(
     name = "prost_build",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
+    crate_root = "prost-build/src/lib.rs",
     crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.6.1",
+    # buildifier: leave-alone
     deps = [
         ":prost_build_build_script",
         "@raze__bytes__0_5_6//:bytes",
@@ -77,17 +87,4 @@ rust_library(
         "@raze__prost_types__0_6_1//:prost_types",
         "@raze__tempfile__3_1_0//:tempfile",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "prost-build/src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.6.1",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-    ],
 )
diff --git a/cargo/remote/prost-derive-0.6.1.BUILD.bazel b/cargo/remote/BUILD.prost-derive-0.6.1.bazel
similarity index 96%
rename from cargo/remote/prost-derive-0.6.1.BUILD.bazel
rename to cargo/remote/BUILD.prost-derive-0.6.1.bazel
index c61ce331e..85e10f3a8 100644
--- a/cargo/remote/prost-derive-0.6.1.BUILD.bazel
+++ b/cargo/remote/BUILD.prost-derive-0.6.1.bazel
@@ -28,12 +28,25 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "prost_derive",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
+    crate_root = "prost-derive/src/lib.rs",
     crate_type = "proc-macro",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.6.1",
+    # buildifier: leave-alone
     deps = [
         "@raze__anyhow__1_0_34//:anyhow",
         "@raze__itertools__0_9_0//:itertools",
@@ -41,17 +54,4 @@ rust_library(
         "@raze__quote__1_0_7//:quote",
         "@raze__syn__1_0_48//:syn",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "prost-derive/src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.6.1",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-    ],
 )
diff --git a/cargo/remote/prost-types-0.6.1.BUILD.bazel b/cargo/remote/BUILD.prost-types-0.6.1.bazel
similarity index 95%
rename from cargo/remote/prost-types-0.6.1.BUILD.bazel
rename to cargo/remote/BUILD.prost-types-0.6.1.bazel
index 149584769..cfa7ef2a1 100644
--- a/cargo/remote/prost-types-0.6.1.BUILD.bazel
+++ b/cargo/remote/BUILD.prost-types-0.6.1.bazel
@@ -28,27 +28,27 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "prost_types",
-    crate_type = "lib",
-    deps = [
-        "@raze__bytes__0_5_6//:bytes",
-        "@raze__prost__0_6_1//:prost",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "prost-types/src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.6.1",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.6.1",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__bytes__0_5_6//:bytes",
+        "@raze__prost__0_6_1//:prost",
     ],
 )
diff --git a/cargo/remote/pyo3-0.12.3.BUILD.bazel b/cargo/remote/BUILD.pyo3-0.12.3.bazel
similarity index 93%
rename from cargo/remote/pyo3-0.12.3.BUILD.bazel
rename to cargo/remote/BUILD.pyo3-0.12.3.bazel
index 1535f2eec..347baa43e 100644
--- a/cargo/remote/pyo3-0.12.3.BUILD.bazel
+++ b/cargo/remote/BUILD.pyo3-0.12.3.bazel
@@ -28,83 +28,17 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "pyo3_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build.rs",
-    edition = "2018",
-    deps = [
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    crate_features = [
-      "abi3",
-      "ctor",
-      "default",
-      "extension-module",
-      "indoc",
-      "inventory",
-      "macros",
-      "paste",
-      "pyo3cls",
-      "unindent",
-    ],
     build_script_env = {
     },
-    data = glob(["**"]),
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    version = "0.12.3",
-    visibility = ["//visibility:private"],
-)
-
-# Unsupported target "bench_dict" with type "bench" omitted
-# Unsupported target "bench_list" with type "bench" omitted
-# Unsupported target "bench_pyobject" with type "bench" omitted
-# Unsupported target "bench_set" with type "bench" omitted
-# Unsupported target "bench_tuple" with type "bench" omitted
-# Unsupported target "common" with type "test" omitted
-
-# buildifier: leave-alone
-rust_library(
-    name = "pyo3",
-    crate_type = "lib",
-    deps = [
-        ":pyo3_build_script",
-        "@raze__indoc__0_3_6//:indoc",
-        "@raze__inventory__0_1_9//:inventory",
-        "@raze__libc__0_2_80//:libc",
-        "@raze__parking_lot__0_11_0//:parking_lot",
-        "@raze__paste__0_1_18//:paste",
-        "@raze__unindent__0_1_7//:unindent",
-    ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    proc_macro_deps = [
-        "@raze__ctor__0_1_16//:ctor",
-        "@raze__pyo3cls__0_12_3//:pyo3cls",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    data = glob(["**"]),
-    version = "0.12.3",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "abi3",
         "ctor",
@@ -117,31 +51,127 @@ rust_library(
         "pyo3cls",
         "unindent",
     ],
+    crate_root = "build.rs",
+    data = glob(["**"]),
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.12.3",
+    visibility = ["//visibility:private"],
+    deps = [
+    ],
 )
+
+# Unsupported target "bench_dict" with type "bench" omitted
+
+# Unsupported target "bench_list" with type "bench" omitted
+
+# Unsupported target "bench_pyobject" with type "bench" omitted
+
+# Unsupported target "bench_set" with type "bench" omitted
+
+# Unsupported target "bench_tuple" with type "bench" omitted
+
+rust_library(
+    name = "pyo3",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "abi3",
+        "ctor",
+        "default",
+        "extension-module",
+        "indoc",
+        "inventory",
+        "macros",
+        "paste",
+        "pyo3cls",
+        "unindent",
+    ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    data = glob(["**"]),
+    edition = "2018",
+    proc_macro_deps = [
+        "@raze__ctor__0_1_16//:ctor",
+        "@raze__pyo3cls__0_12_3//:pyo3cls",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.12.3",
+    # buildifier: leave-alone
+    deps = [
+        ":pyo3_build_script",
+        "@raze__indoc__0_3_6//:indoc",
+        "@raze__inventory__0_1_9//:inventory",
+        "@raze__libc__0_2_80//:libc",
+        "@raze__parking_lot__0_11_0//:parking_lot",
+        "@raze__paste__0_1_18//:paste",
+        "@raze__unindent__0_1_7//:unindent",
+    ],
+)
+
+# Unsupported target "common" with type "test" omitted
+
 # Unsupported target "test_arithmetics" with type "test" omitted
+
 # Unsupported target "test_buffer_protocol" with type "test" omitted
+
 # Unsupported target "test_bytes" with type "test" omitted
+
 # Unsupported target "test_class_attributes" with type "test" omitted
+
 # Unsupported target "test_class_basics" with type "test" omitted
+
 # Unsupported target "test_class_conversion" with type "test" omitted
+
 # Unsupported target "test_class_new" with type "test" omitted
+
 # Unsupported target "test_compile_error" with type "test" omitted
+
 # Unsupported target "test_datetime" with type "test" omitted
+
 # Unsupported target "test_dict_iter" with type "test" omitted
+
 # Unsupported target "test_dunder" with type "test" omitted
+
 # Unsupported target "test_exceptions" with type "test" omitted
+
 # Unsupported target "test_frompyobject" with type "test" omitted
+
 # Unsupported target "test_gc" with type "test" omitted
+
 # Unsupported target "test_getter_setter" with type "test" omitted
+
 # Unsupported target "test_inheritance" with type "test" omitted
+
 # Unsupported target "test_mapping" with type "test" omitted
+
 # Unsupported target "test_methods" with type "test" omitted
+
 # Unsupported target "test_module" with type "test" omitted
+
 # Unsupported target "test_pyfunction" with type "test" omitted
+
 # Unsupported target "test_pyself" with type "test" omitted
+
 # Unsupported target "test_sequence" with type "test" omitted
+
 # Unsupported target "test_string" with type "test" omitted
+
 # Unsupported target "test_text_signature" with type "test" omitted
+
 # Unsupported target "test_unsendable_dict" with type "test" omitted
+
 # Unsupported target "test_variable_arguments" with type "test" omitted
+
 # Unsupported target "test_various" with type "test" omitted
diff --git a/cargo/remote/pyo3-derive-backend-0.12.3.BUILD.bazel b/cargo/remote/BUILD.pyo3-derive-backend-0.12.3.bazel
similarity index 95%
rename from cargo/remote/pyo3-derive-backend-0.12.3.BUILD.bazel
rename to cargo/remote/BUILD.pyo3-derive-backend-0.12.3.bazel
index d3fd9de26..7707b7b4f 100644
--- a/cargo/remote/pyo3-derive-backend-0.12.3.BUILD.bazel
+++ b/cargo/remote/BUILD.pyo3-derive-backend-0.12.3.bazel
@@ -28,28 +28,28 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "pyo3_derive_backend",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
+    crate_root = "pyo3-derive-backend/src/lib.rs",
     crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.12.3",
+    # buildifier: leave-alone
     deps = [
         "@raze__proc_macro2__1_0_24//:proc_macro2",
         "@raze__quote__1_0_7//:quote",
         "@raze__syn__1_0_48//:syn",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "pyo3-derive-backend/src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.12.3",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-    ],
 )
diff --git a/cargo/remote/pyo3cls-0.12.3.BUILD.bazel b/cargo/remote/BUILD.pyo3cls-0.12.3.bazel
similarity index 95%
rename from cargo/remote/pyo3cls-0.12.3.BUILD.bazel
rename to cargo/remote/BUILD.pyo3cls-0.12.3.bazel
index 2bc1c09b1..16945433b 100644
--- a/cargo/remote/pyo3cls-0.12.3.BUILD.bazel
+++ b/cargo/remote/BUILD.pyo3cls-0.12.3.bazel
@@ -28,28 +28,28 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "pyo3cls",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
+    crate_root = "pyo3cls/src/lib.rs",
     crate_type = "proc-macro",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.12.3",
+    # buildifier: leave-alone
     deps = [
         "@raze__pyo3_derive_backend__0_12_3//:pyo3_derive_backend",
         "@raze__quote__1_0_7//:quote",
         "@raze__syn__1_0_48//:syn",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "pyo3cls/src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.12.3",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-    ],
 )
diff --git a/cargo/remote/quote-1.0.7.BUILD.bazel b/cargo/remote/BUILD.quote-1.0.7.bazel
similarity index 95%
rename from cargo/remote/quote-1.0.7.BUILD.bazel
rename to cargo/remote/BUILD.quote-1.0.7.bazel
index 81bdef1c4..bdc69e43c 100644
--- a/cargo/remote/quote-1.0.7.BUILD.bazel
+++ b/cargo/remote/BUILD.quote-1.0.7.bazel
@@ -28,30 +28,32 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# Unsupported target "compiletest" with type "test" omitted
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "quote",
-    crate_type = "lib",
-    deps = [
-        "@raze__proc_macro2__1_0_24//:proc_macro2",
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "1.0.7",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "default",
         "proc-macro",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "1.0.7",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__proc_macro2__1_0_24//:proc_macro2",
+    ],
 )
+
+# Unsupported target "compiletest" with type "test" omitted
+
 # Unsupported target "test" with type "test" omitted
diff --git a/cargo/remote/rand-0.7.3.BUILD.bazel b/cargo/remote/BUILD.rand-0.7.3.bazel
similarity index 97%
rename from cargo/remote/rand-0.7.3.BUILD.bazel
rename to cargo/remote/BUILD.rand-0.7.3.bazel
index 3b31fcdfc..33dc39dbc 100644
--- a/cargo/remote/rand-0.7.3.BUILD.bazel
+++ b/cargo/remote/BUILD.rand-0.7.3.bazel
@@ -28,16 +28,46 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "generators" with type "bench" omitted
+
 # Unsupported target "misc" with type "bench" omitted
+
+# Unsupported target "seq" with type "bench" omitted
+
+# Unsupported target "weighted" with type "bench" omitted
+
 # Unsupported target "monte-carlo" with type "example" omitted
+
 # Unsupported target "monty-hall" with type "example" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "rand",
+    srcs = glob(["**/*.rs"]),
+    aliases = {
+        "@raze__getrandom__0_1_15//:getrandom": "getrandom_package",
+    },
+    crate_features = [
+        "alloc",
+        "default",
+        "getrandom",
+        "getrandom_package",
+        "libc",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.7.3",
+    # buildifier: leave-alone
     deps = [
         "@raze__getrandom__0_1_15//:getrandom",
         "@raze__rand_chacha__0_2_2//:rand_chacha",
@@ -56,28 +86,4 @@ rust_library(
         ],
         "//conditions:default": [],
     }),
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.7.3",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-        "alloc",
-        "default",
-        "getrandom",
-        "getrandom_package",
-        "libc",
-        "std",
-    ],
-    aliases = {
-        "@raze__getrandom__0_1_15//:getrandom": "getrandom_package",
-    },
 )
-# Unsupported target "seq" with type "bench" omitted
-# Unsupported target "weighted" with type "bench" omitted
diff --git a/cargo/remote/rand_chacha-0.2.2.BUILD.bazel b/cargo/remote/BUILD.rand_chacha-0.2.2.bazel
similarity index 95%
rename from cargo/remote/rand_chacha-0.2.2.BUILD.bazel
rename to cargo/remote/BUILD.rand_chacha-0.2.2.bazel
index fe33c79b1..81a13797e 100644
--- a/cargo/remote/rand_chacha-0.2.2.BUILD.bazel
+++ b/cargo/remote/BUILD.rand_chacha-0.2.2.bazel
@@ -28,28 +28,28 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "rand_chacha",
-    crate_type = "lib",
-    deps = [
-        "@raze__ppv_lite86__0_2_10//:ppv_lite86",
-        "@raze__rand_core__0_5_1//:rand_core",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "std",
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.2.2",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
-        "std",
+    version = "0.2.2",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__ppv_lite86__0_2_10//:ppv_lite86",
+        "@raze__rand_core__0_5_1//:rand_core",
     ],
 )
diff --git a/cargo/remote/rand_core-0.5.1.BUILD.bazel b/cargo/remote/BUILD.rand_core-0.5.1.bazel
similarity index 95%
rename from cargo/remote/rand_core-0.5.1.BUILD.bazel
rename to cargo/remote/BUILD.rand_core-0.5.1.bazel
index c22a46d8d..e7c8c49e2 100644
--- a/cargo/remote/rand_core-0.5.1.BUILD.bazel
+++ b/cargo/remote/BUILD.rand_core-0.5.1.bazel
@@ -28,29 +28,29 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "rand_core",
-    crate_type = "lib",
-    deps = [
-        "@raze__getrandom__0_1_15//:getrandom",
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.5.1",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "alloc",
         "getrandom",
         "std",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.5.1",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__getrandom__0_1_15//:getrandom",
+    ],
 )
diff --git a/cargo/remote/rand_hc-0.2.0.BUILD.bazel b/cargo/remote/BUILD.rand_hc-0.2.0.bazel
similarity index 95%
rename from cargo/remote/rand_hc-0.2.0.BUILD.bazel
rename to cargo/remote/BUILD.rand_hc-0.2.0.bazel
index d04ddfd9e..794236c62 100644
--- a/cargo/remote/rand_hc-0.2.0.BUILD.bazel
+++ b/cargo/remote/BUILD.rand_hc-0.2.0.bazel
@@ -28,26 +28,26 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "rand_hc",
-    crate_type = "lib",
-    deps = [
-        "@raze__rand_core__0_5_1//:rand_core",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.2.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.2.0",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__rand_core__0_5_1//:rand_core",
     ],
 )
diff --git a/cargo/remote/redox_syscall-0.1.57.BUILD.bazel b/cargo/remote/BUILD.redox_syscall-0.1.57.bazel
similarity index 95%
rename from cargo/remote/redox_syscall-0.1.57.BUILD.bazel
rename to cargo/remote/BUILD.redox_syscall-0.1.57.bazel
index 81799b8b9..b1622cee7 100644
--- a/cargo/remote/redox_syscall-0.1.57.BUILD.bazel
+++ b/cargo/remote/BUILD.redox_syscall-0.1.57.bazel
@@ -28,7 +28,7 @@ licenses([
     "notice",  # MIT from expression "MIT"
 ])
 
-# Generated targets
+# Generated Targets
 
 alias(
     name = "redox_syscall",
@@ -39,23 +39,23 @@ alias(
     ],
 )
 
-# buildifier: leave-alone
 rust_library(
     name = "syscall",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.1.57",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.1.57",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
diff --git a/cargo/remote/redox_users-0.3.5.BUILD.bazel b/cargo/remote/BUILD.redox_users-0.3.5.bazel
similarity index 95%
rename from cargo/remote/redox_users-0.3.5.BUILD.bazel
rename to cargo/remote/BUILD.redox_users-0.3.5.bazel
index 6505112eb..3f17e5353 100644
--- a/cargo/remote/redox_users-0.3.5.BUILD.bazel
+++ b/cargo/remote/BUILD.redox_users-0.3.5.bazel
@@ -28,31 +28,31 @@ licenses([
     "notice",  # MIT from expression "MIT"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "redox_users",
-    crate_type = "lib",
-    deps = [
-        "@raze__getrandom__0_1_15//:getrandom",
-        "@raze__redox_syscall__0_1_57//:redox_syscall",
-        "@raze__rust_argon2__0_8_2//:rust_argon2",
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.3.5",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "auth",
         "default",
         "rust-argon2",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.3.5",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__getrandom__0_1_15//:getrandom",
+        "@raze__redox_syscall__0_1_57//:redox_syscall",
+        "@raze__rust_argon2__0_8_2//:rust_argon2",
+    ],
 )
diff --git a/cargo/remote/regex-1.4.2.BUILD.bazel b/cargo/remote/BUILD.regex-1.4.2.bazel
similarity index 95%
rename from cargo/remote/regex-1.4.2.BUILD.bazel
rename to cargo/remote/BUILD.regex-1.4.2.bazel
index 9f235be5f..3ca17215d 100644
--- a/cargo/remote/regex-1.4.2.BUILD.bazel
+++ b/cargo/remote/BUILD.regex-1.4.2.bazel
@@ -28,38 +28,23 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# Unsupported target "backtrack" with type "test" omitted
-# Unsupported target "backtrack-bytes" with type "test" omitted
-# Unsupported target "backtrack-utf8bytes" with type "test" omitted
-# Unsupported target "crates-regex" with type "test" omitted
-# Unsupported target "default" with type "test" omitted
-# Unsupported target "default-bytes" with type "test" omitted
-# Unsupported target "nfa" with type "test" omitted
-# Unsupported target "nfa-bytes" with type "test" omitted
-# Unsupported target "nfa-utf8bytes" with type "test" omitted
+# Generated Targets
+
+# Unsupported target "shootout-regex-dna" with type "example" omitted
+
+# Unsupported target "shootout-regex-dna-bytes" with type "example" omitted
+
+# Unsupported target "shootout-regex-dna-cheat" with type "example" omitted
+
+# Unsupported target "shootout-regex-dna-replace" with type "example" omitted
+
+# Unsupported target "shootout-regex-dna-single" with type "example" omitted
+
+# Unsupported target "shootout-regex-dna-single-cheat" with type "example" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "regex",
-    crate_type = "lib",
-    deps = [
-        "@raze__aho_corasick__0_7_14//:aho_corasick",
-        "@raze__memchr__2_3_4//:memchr",
-        "@raze__regex_syntax__0_6_21//:regex_syntax",
-        "@raze__thread_local__1_0_1//:thread_local",
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "1.4.2",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "aho-corasick",
         "default",
@@ -80,10 +65,40 @@ rust_library(
         "unicode-script",
         "unicode-segment",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "1.4.2",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__aho_corasick__0_7_15//:aho_corasick",
+        "@raze__memchr__2_3_4//:memchr",
+        "@raze__regex_syntax__0_6_21//:regex_syntax",
+        "@raze__thread_local__1_0_1//:thread_local",
+    ],
 )
-# Unsupported target "shootout-regex-dna" with type "example" omitted
-# Unsupported target "shootout-regex-dna-bytes" with type "example" omitted
-# Unsupported target "shootout-regex-dna-cheat" with type "example" omitted
-# Unsupported target "shootout-regex-dna-replace" with type "example" omitted
-# Unsupported target "shootout-regex-dna-single" with type "example" omitted
-# Unsupported target "shootout-regex-dna-single-cheat" with type "example" omitted
+
+# Unsupported target "backtrack" with type "test" omitted
+
+# Unsupported target "backtrack-bytes" with type "test" omitted
+
+# Unsupported target "backtrack-utf8bytes" with type "test" omitted
+
+# Unsupported target "crates-regex" with type "test" omitted
+
+# Unsupported target "default" with type "test" omitted
+
+# Unsupported target "default-bytes" with type "test" omitted
+
+# Unsupported target "nfa" with type "test" omitted
+
+# Unsupported target "nfa-bytes" with type "test" omitted
+
+# Unsupported target "nfa-utf8bytes" with type "test" omitted
diff --git a/cargo/remote/regex-syntax-0.6.21.BUILD.bazel b/cargo/remote/BUILD.regex-syntax-0.6.21.bazel
similarity index 96%
rename from cargo/remote/regex-syntax-0.6.21.BUILD.bazel
rename to cargo/remote/BUILD.regex-syntax-0.6.21.bazel
index af73fd673..583a91f05 100644
--- a/cargo/remote/regex-syntax-0.6.21.BUILD.bazel
+++ b/cargo/remote/BUILD.regex-syntax-0.6.21.bazel
@@ -28,26 +28,13 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "bench" with type "bench" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "regex_syntax",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.6.21",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "default",
         "unicode",
@@ -59,4 +46,18 @@ rust_library(
         "unicode-script",
         "unicode-segment",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.6.21",
+    # buildifier: leave-alone
+    deps = [
+    ],
 )
diff --git a/cargo/remote/remove_dir_all-0.5.3.BUILD.bazel b/cargo/remote/BUILD.remove_dir_all-0.5.3.bazel
similarity index 96%
rename from cargo/remote/remove_dir_all-0.5.3.BUILD.bazel
rename to cargo/remote/BUILD.remove_dir_all-0.5.3.bazel
index e300d6ddb..fb69dad67 100644
--- a/cargo/remote/remove_dir_all-0.5.3.BUILD.bazel
+++ b/cargo/remote/BUILD.remove_dir_all-0.5.3.bazel
@@ -28,12 +28,27 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "remove_dir_all",
+    srcs = glob(["**/*.rs"]),
+    aliases = {
+    },
+    crate_features = [
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.5.3",
+    # buildifier: leave-alone
     deps = [
     ] + selects.with_or({
         # cfg(windows)
@@ -45,19 +60,4 @@ rust_library(
         ],
         "//conditions:default": [],
     }),
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.5.3",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-    ],
-    aliases = {
-    },
 )
diff --git a/cargo/remote/rental-0.5.5.BUILD.bazel b/cargo/remote/BUILD.rental-0.5.5.bazel
similarity index 96%
rename from cargo/remote/rental-0.5.5.BUILD.bazel
rename to cargo/remote/BUILD.rental-0.5.5.bazel
index 4d7f94313..ff8749f66 100644
--- a/cargo/remote/rental-0.5.5.BUILD.bazel
+++ b/cargo/remote/BUILD.rental-0.5.5.bazel
@@ -28,26 +28,17 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# Unsupported target "clone" with type "test" omitted
-# Unsupported target "complex" with type "test" omitted
-# Unsupported target "complex_mut" with type "test" omitted
-# Unsupported target "covariant" with type "test" omitted
-# Unsupported target "debug" with type "test" omitted
-# Unsupported target "drop_order" with type "test" omitted
-# Unsupported target "generic" with type "test" omitted
-# Unsupported target "lt_params" with type "test" omitted
-# Unsupported target "map" with type "test" omitted
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "rental",
-    crate_type = "lib",
-    deps = [
-        "@raze__stable_deref_trait__1_2_0//:stable_deref_trait",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "default",
+        "std",
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     proc_macro_deps = [
         "@raze__rental_impl__0_5_5//:rental_impl",
@@ -55,21 +46,47 @@ rust_library(
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.5.5",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
-        "default",
-        "std",
+    version = "0.5.5",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__stable_deref_trait__1_2_0//:stable_deref_trait",
     ],
 )
+
+# Unsupported target "clone" with type "test" omitted
+
+# Unsupported target "complex" with type "test" omitted
+
+# Unsupported target "complex_mut" with type "test" omitted
+
+# Unsupported target "covariant" with type "test" omitted
+
+# Unsupported target "debug" with type "test" omitted
+
+# Unsupported target "drop_order" with type "test" omitted
+
+# Unsupported target "generic" with type "test" omitted
+
+# Unsupported target "lt_params" with type "test" omitted
+
+# Unsupported target "map" with type "test" omitted
+
 # Unsupported target "simple_mut" with type "test" omitted
+
 # Unsupported target "simple_ref" with type "test" omitted
+
 # Unsupported target "string" with type "test" omitted
+
 # Unsupported target "subrental" with type "test" omitted
+
 # Unsupported target "target_ty_hack" with type "test" omitted
+
 # Unsupported target "trait" with type "test" omitted
+
 # Unsupported target "unused" with type "test" omitted
+
 # Unsupported target "vec_slice" with type "test" omitted
diff --git a/cargo/remote/rental-impl-0.5.5.BUILD.bazel b/cargo/remote/BUILD.rental-impl-0.5.5.bazel
similarity index 95%
rename from cargo/remote/rental-impl-0.5.5.BUILD.bazel
rename to cargo/remote/BUILD.rental-impl-0.5.5.bazel
index 228f2554a..34d0ff75e 100644
--- a/cargo/remote/rental-impl-0.5.5.BUILD.bazel
+++ b/cargo/remote/BUILD.rental-impl-0.5.5.bazel
@@ -28,28 +28,28 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "rental_impl",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "proc-macro",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.5.5",
+    # buildifier: leave-alone
     deps = [
         "@raze__proc_macro2__1_0_24//:proc_macro2",
         "@raze__quote__1_0_7//:quote",
         "@raze__syn__1_0_48//:syn",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.5.5",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-    ],
 )
diff --git a/cargo/remote/reqwest-0.10.8.BUILD.bazel b/cargo/remote/BUILD.reqwest-0.10.8.bazel
similarity index 95%
rename from cargo/remote/reqwest-0.10.8.BUILD.bazel
rename to cargo/remote/BUILD.reqwest-0.10.8.bazel
index a64c908c7..02e58435b 100644
--- a/cargo/remote/reqwest-0.10.8.BUILD.bazel
+++ b/cargo/remote/BUILD.reqwest-0.10.8.bazel
@@ -28,25 +28,51 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# Unsupported target "badssl" with type "test" omitted
-# Unsupported target "blocking" with type "example" omitted
-# Unsupported target "blocking" with type "test" omitted
-# Unsupported target "brotli" with type "test" omitted
-# Unsupported target "client" with type "test" omitted
-# Unsupported target "cookie" with type "test" omitted
-# Unsupported target "form" with type "example" omitted
-# Unsupported target "gzip" with type "test" omitted
-# Unsupported target "json_dynamic" with type "example" omitted
-# Unsupported target "json_typed" with type "example" omitted
-# Unsupported target "multipart" with type "test" omitted
-# Unsupported target "proxy" with type "test" omitted
-# Unsupported target "redirect" with type "test" omitted
+# Generated Targets
+
+# Unsupported target "blocking" with type "example" omitted
+
+# Unsupported target "form" with type "example" omitted
+
+# Unsupported target "json_dynamic" with type "example" omitted
+
+# Unsupported target "json_typed" with type "example" omitted
+
+# Unsupported target "simple" with type "example" omitted
+
+# Unsupported target "tor_socks" with type "example" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "reqwest",
+    srcs = glob(["**/*.rs"]),
+    aliases = {
+    },
+    crate_features = [
+        "__rustls",
+        "__tls",
+        "hyper-rustls",
+        "json",
+        "rustls",
+        "rustls-native-certs",
+        "rustls-tls-native-roots",
+        "serde_json",
+        "socks",
+        "stream",
+        "tokio-rustls",
+        "tokio-socks",
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.10.8",
+    # buildifier: leave-alone
     deps = [
         "@raze__bytes__0_5_6//:bytes",
         "@raze__http__0_2_1//:http",
@@ -55,7 +81,7 @@ rust_library(
         "@raze__serde__1_0_117//:serde",
         "@raze__serde_json__1_0_59//:serde_json",
         "@raze__serde_urlencoded__0_6_1//:serde_urlencoded",
-        "@raze__url__2_1_1//:url",
+        "@raze__url__2_2_0//:url",
     ] + selects.with_or({
         # cfg(not(target_arch = "wasm32"))
         (
@@ -70,8 +96,8 @@ rust_library(
         ): [
             "@raze__base64__0_13_0//:base64",
             "@raze__encoding_rs__0_8_26//:encoding_rs",
-            "@raze__futures_core__0_3_7//:futures_core",
-            "@raze__futures_util__0_3_7//:futures_util",
+            "@raze__futures_core__0_3_8//:futures_core",
+            "@raze__futures_util__0_3_8//:futures_util",
             "@raze__http_body__0_3_1//:http_body",
             "@raze__hyper__0_13_9//:hyper",
             "@raze__hyper_rustls__0_21_0//:hyper_rustls",
@@ -98,34 +124,24 @@ rust_library(
         ],
         "//conditions:default": [],
     }),
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.10.8",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-        "__rustls",
-        "__tls",
-        "hyper-rustls",
-        "json",
-        "rustls",
-        "rustls-native-certs",
-        "rustls-tls-native-roots",
-        "serde_json",
-        "socks",
-        "stream",
-        "tokio-rustls",
-        "tokio-socks",
-    ],
-    aliases = {
-    },
 )
-# Unsupported target "simple" with type "example" omitted
+
+# Unsupported target "badssl" with type "test" omitted
+
+# Unsupported target "blocking" with type "test" omitted
+
+# Unsupported target "brotli" with type "test" omitted
+
+# Unsupported target "client" with type "test" omitted
+
+# Unsupported target "cookie" with type "test" omitted
+
+# Unsupported target "gzip" with type "test" omitted
+
+# Unsupported target "multipart" with type "test" omitted
+
+# Unsupported target "proxy" with type "test" omitted
+
+# Unsupported target "redirect" with type "test" omitted
+
 # Unsupported target "timeouts" with type "test" omitted
-# Unsupported target "tor_socks" with type "example" omitted
diff --git a/cargo/remote/ring-0.16.15.BUILD.bazel b/cargo/remote/BUILD.ring-0.16.15.bazel
similarity index 97%
rename from cargo/remote/ring-0.16.15.BUILD.bazel
rename to cargo/remote/BUILD.ring-0.16.15.bazel
index 98beb9f0d..83e85b267 100644
--- a/cargo/remote/ring-0.16.15.BUILD.bazel
+++ b/cargo/remote/BUILD.ring-0.16.15.bazel
@@ -28,21 +28,37 @@ licenses([
     "restricted",  # no license
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "ring_build_script",
     srcs = glob(["**/*.rs"]),
+    build_script_env = {
+    },
+    crate_features = [
+        "alloc",
+        "default",
+        "dev_urandom_fallback",
+        "once_cell",
+    ],
     crate_root = "build.rs",
+    data = glob(["**"]),
     edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.16.15",
+    visibility = ["//visibility:private"],
     deps = [
-        "@raze__cc__1_0_61//:cc",
+        "@raze__cc__1_0_62//:cc",
     ] + selects.with_or({
         # cfg(all(any(target_arch = "aarch64", target_arch = "arm", target_arch = "x86", target_arch = "x86_64"), not(target_os = "ios")))
         (
@@ -94,42 +110,32 @@ cargo_build_script(
         ],
         "//conditions:default": [],
     }),
+)
+
+rust_library(
+    name = "ring",
+    srcs = glob(["**/*.rs"]),
+    aliases = {
+    },
+    crate_features = [
+        "alloc",
+        "default",
+        "dev_urandom_fallback",
+        "once_cell",
+    ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    data = glob(["src/**"]),
+    edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    crate_features = [
-      "alloc",
-      "default",
-      "dev_urandom_fallback",
-      "once_cell",
-    ],
-    build_script_env = {
-    },
-    data = glob(["**"]),
     tags = [
         "cargo-raze",
         "manual",
     ],
     version = "0.16.15",
-    visibility = ["//visibility:private"],
-)
-
-# Unsupported target "aead_tests" with type "test" omitted
-# Unsupported target "agreement_tests" with type "test" omitted
-# Unsupported target "constant_time_tests" with type "test" omitted
-# Unsupported target "digest_tests" with type "test" omitted
-# Unsupported target "ecdsa_tests" with type "test" omitted
-# Unsupported target "ed25519_tests" with type "test" omitted
-# Unsupported target "hkdf_tests" with type "test" omitted
-# Unsupported target "hmac_tests" with type "test" omitted
-# Unsupported target "pbkdf2_tests" with type "test" omitted
-# Unsupported target "quic_tests" with type "test" omitted
-# Unsupported target "rand_tests" with type "test" omitted
-
-# buildifier: leave-alone
-rust_library(
-    name = "ring",
-    crate_type = "lib",
+    # buildifier: leave-alone
     deps = [
         ":ring_build_script",
         "@raze__untrusted__0_7_1//:untrusted",
@@ -188,26 +194,30 @@ rust_library(
         ],
         "//conditions:default": [],
     }),
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    data = glob(["src/**"]),
-    version = "0.16.15",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-        "alloc",
-        "default",
-        "dev_urandom_fallback",
-        "once_cell",
-    ],
-    aliases = {
-    },
 )
+
+# Unsupported target "aead_tests" with type "test" omitted
+
+# Unsupported target "agreement_tests" with type "test" omitted
+
+# Unsupported target "constant_time_tests" with type "test" omitted
+
+# Unsupported target "digest_tests" with type "test" omitted
+
+# Unsupported target "ecdsa_tests" with type "test" omitted
+
+# Unsupported target "ed25519_tests" with type "test" omitted
+
+# Unsupported target "hkdf_tests" with type "test" omitted
+
+# Unsupported target "hmac_tests" with type "test" omitted
+
+# Unsupported target "pbkdf2_tests" with type "test" omitted
+
+# Unsupported target "quic_tests" with type "test" omitted
+
+# Unsupported target "rand_tests" with type "test" omitted
+
 # Unsupported target "rsa_tests" with type "test" omitted
+
 # Unsupported target "signature_tests" with type "test" omitted
diff --git a/cargo/remote/rusqlite-0.24.1.BUILD.bazel b/cargo/remote/BUILD.rusqlite-0.24.1.bazel
similarity index 96%
rename from cargo/remote/rusqlite-0.24.1.BUILD.bazel
rename to cargo/remote/BUILD.rusqlite-0.24.1.bazel
index c6c1dffdb..b2bf86793 100644
--- a/cargo/remote/rusqlite-0.24.1.BUILD.bazel
+++ b/cargo/remote/BUILD.rusqlite-0.24.1.bazel
@@ -28,16 +28,34 @@ licenses([
     "notice",  # MIT from expression "MIT"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "cache" with type "bench" omitted
-# Unsupported target "config_log" with type "test" omitted
-# Unsupported target "deny_single_threaded_sqlite_config" with type "test" omitted
+
 # Unsupported target "exec" with type "bench" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "rusqlite",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "bundled",
+        "collation",
+        "functions",
+        "modern_sqlite",
+        "trace",
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.24.1",
+    # buildifier: leave-alone
     deps = [
         "@raze__bitflags__1_2_1//:bitflags",
         "@raze__fallible_iterator__0_2_0//:fallible_iterator",
@@ -47,23 +65,10 @@ rust_library(
         "@raze__memchr__2_3_4//:memchr",
         "@raze__smallvec__1_4_2//:smallvec",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.24.1",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-        "bundled",
-        "collation",
-        "functions",
-        "modern_sqlite",
-        "trace",
-    ],
 )
+
+# Unsupported target "config_log" with type "test" omitted
+
+# Unsupported target "deny_single_threaded_sqlite_config" with type "test" omitted
+
 # Unsupported target "vtab" with type "test" omitted
diff --git a/cargo/remote/rust-argon2-0.8.2.BUILD.bazel b/cargo/remote/BUILD.rust-argon2-0.8.2.bazel
similarity index 96%
rename from cargo/remote/rust-argon2-0.8.2.BUILD.bazel
rename to cargo/remote/BUILD.rust-argon2-0.8.2.bazel
index 3f17afdf0..9789f9058 100644
--- a/cargo/remote/rust-argon2-0.8.2.BUILD.bazel
+++ b/cargo/remote/BUILD.rust-argon2-0.8.2.bazel
@@ -28,7 +28,7 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
 alias(
     name = "rust_argon2",
@@ -39,30 +39,31 @@ alias(
     ],
 )
 
-# buildifier: leave-alone
 rust_library(
     name = "argon2",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "crossbeam-utils",
+        "default",
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.8.2",
+    # buildifier: leave-alone
     deps = [
         "@raze__base64__0_12_3//:base64",
         "@raze__blake2b_simd__0_5_11//:blake2b_simd",
         "@raze__constant_time_eq__0_1_5//:constant_time_eq",
         "@raze__crossbeam_utils__0_7_2//:crossbeam_utils",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.8.2",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-        "crossbeam-utils",
-        "default",
-    ],
 )
+
 # Unsupported target "integration_test" with type "test" omitted
diff --git a/cargo/remote/rustc-demangle-0.1.18.BUILD.bazel b/cargo/remote/BUILD.rustc-demangle-0.1.18.bazel
similarity index 95%
rename from cargo/remote/rustc-demangle-0.1.18.BUILD.bazel
rename to cargo/remote/BUILD.rustc-demangle-0.1.18.bazel
index 4b471d666..144c9a6df 100644
--- a/cargo/remote/rustc-demangle-0.1.18.BUILD.bazel
+++ b/cargo/remote/BUILD.rustc-demangle-0.1.18.bazel
@@ -28,25 +28,25 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "rustc_demangle",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.1.18",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.1.18",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
diff --git a/cargo/remote/rustls-0.18.1.BUILD.bazel b/cargo/remote/BUILD.rustls-0.18.1.bazel
similarity index 96%
rename from cargo/remote/rustls-0.18.1.BUILD.bazel
rename to cargo/remote/BUILD.rustls-0.18.1.bazel
index 25c4a5a0b..d7ec115d1 100644
--- a/cargo/remote/rustls-0.18.1.BUILD.bazel
+++ b/cargo/remote/BUILD.rustls-0.18.1.bazel
@@ -28,18 +28,43 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0 OR (ISC OR MIT)"
 ])
 
-# Generated targets
-# Unsupported target "api" with type "test" omitted
-# Unsupported target "bench" with type "example" omitted
+# Generated Targets
+
 # Unsupported target "benchmarks" with type "bench" omitted
-# Unsupported target "benchmarks" with type "test" omitted
+
+# Unsupported target "bench" with type "example" omitted
+
 # Unsupported target "bogo_shim" with type "example" omitted
+
 # Unsupported target "limitedclient" with type "example" omitted
 
-# buildifier: leave-alone
+# Unsupported target "simple_0rtt_client" with type "example" omitted
+
+# Unsupported target "simpleclient" with type "example" omitted
+
+# Unsupported target "trytls_shim" with type "example" omitted
+
 rust_library(
     name = "rustls",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "dangerous_configuration",
+        "default",
+        "log",
+        "logging",
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.18.1",
+    # buildifier: leave-alone
     deps = [
         "@raze__base64__0_12_3//:base64",
         "@raze__log__0_4_11//:log",
@@ -47,24 +72,8 @@ rust_library(
         "@raze__sct__0_6_0//:sct",
         "@raze__webpki__0_21_3//:webpki",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.18.1",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-        "dangerous_configuration",
-        "default",
-        "log",
-        "logging",
-    ],
 )
-# Unsupported target "simple_0rtt_client" with type "example" omitted
-# Unsupported target "simpleclient" with type "example" omitted
-# Unsupported target "trytls_shim" with type "example" omitted
+
+# Unsupported target "api" with type "test" omitted
+
+# Unsupported target "benchmarks" with type "test" omitted
diff --git a/cargo/remote/rustls-native-certs-0.4.0.BUILD.bazel b/cargo/remote/BUILD.rustls-native-certs-0.4.0.bazel
similarity index 97%
rename from cargo/remote/rustls-native-certs-0.4.0.BUILD.bazel
rename to cargo/remote/BUILD.rustls-native-certs-0.4.0.bazel
index d235504e0..25eb62178 100644
--- a/cargo/remote/rustls-native-certs-0.4.0.BUILD.bazel
+++ b/cargo/remote/BUILD.rustls-native-certs-0.4.0.bazel
@@ -28,14 +28,29 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0 OR (ISC OR MIT)"
 ])
 
-# Generated targets
-# Unsupported target "compare_mozilla" with type "test" omitted
+# Generated Targets
+
 # Unsupported target "google" with type "example" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "rustls_native_certs",
+    srcs = glob(["**/*.rs"]),
+    aliases = {
+    },
+    crate_features = [
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.4.0",
+    # buildifier: leave-alone
     deps = [
         "@raze__rustls__0_18_1//:rustls",
     ] + selects.with_or({
@@ -68,20 +83,8 @@ rust_library(
         ],
         "//conditions:default": [],
     }),
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.4.0",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-    ],
-    aliases = {
-    },
 )
+
+# Unsupported target "compare_mozilla" with type "test" omitted
+
 # Unsupported target "smoketests" with type "test" omitted
diff --git a/cargo/remote/ryu-1.0.5.BUILD.bazel b/cargo/remote/BUILD.ryu-1.0.5.bazel
similarity index 95%
rename from cargo/remote/ryu-1.0.5.BUILD.bazel
rename to cargo/remote/BUILD.ryu-1.0.5.bazel
index 02b5cae0e..bac074e8d 100644
--- a/cargo/remote/ryu-1.0.5.BUILD.bazel
+++ b/cargo/remote/BUILD.ryu-1.0.5.bazel
@@ -28,65 +28,71 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0 OR BSL-1.0"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "ryu_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build.rs",
-    edition = "2018",
-    deps = [
+    build_script_env = {
+    },
+    crate_features = [
     ],
+    crate_root = "build.rs",
+    data = glob(["**"]),
+    edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    crate_features = [
-    ],
-    build_script_env = {
-    },
-    data = glob(["**"]),
     tags = [
         "cargo-raze",
         "manual",
     ],
     version = "1.0.5",
     visibility = ["//visibility:private"],
+    deps = [
+    ],
 )
 
 # Unsupported target "bench" with type "bench" omitted
-# Unsupported target "common_test" with type "test" omitted
-# Unsupported target "d2s_table_test" with type "test" omitted
-# Unsupported target "d2s_test" with type "test" omitted
-# Unsupported target "exhaustive" with type "test" omitted
-# Unsupported target "f2s_test" with type "test" omitted
 
-# buildifier: leave-alone
+# Unsupported target "upstream_benchmark" with type "example" omitted
+
 rust_library(
     name = "ryu",
-    crate_type = "lib",
-    deps = [
-        ":ryu_build_script",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "1.0.5",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "1.0.5",
+    # buildifier: leave-alone
+    deps = [
+        ":ryu_build_script",
     ],
 )
+
+# Unsupported target "common_test" with type "test" omitted
+
+# Unsupported target "d2s_table_test" with type "test" omitted
+
+# Unsupported target "d2s_test" with type "test" omitted
+
+# Unsupported target "exhaustive" with type "test" omitted
+
+# Unsupported target "f2s_test" with type "test" omitted
+
 # Unsupported target "s2d_test" with type "test" omitted
+
 # Unsupported target "s2f_test" with type "test" omitted
-# Unsupported target "upstream_benchmark" with type "example" omitted
diff --git a/cargo/remote/schannel-0.1.19.BUILD.bazel b/cargo/remote/BUILD.schannel-0.1.19.bazel
similarity index 95%
rename from cargo/remote/schannel-0.1.19.BUILD.bazel
rename to cargo/remote/BUILD.schannel-0.1.19.bazel
index ceb0314ad..d2bde1715 100644
--- a/cargo/remote/schannel-0.1.19.BUILD.bazel
+++ b/cargo/remote/BUILD.schannel-0.1.19.bazel
@@ -28,27 +28,27 @@ licenses([
     "notice",  # MIT from expression "MIT"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "schannel",
-    crate_type = "lib",
-    deps = [
-        "@raze__lazy_static__1_4_0//:lazy_static",
-        "@raze__winapi__0_3_9//:winapi",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.1.19",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.1.19",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__lazy_static__1_4_0//:lazy_static",
+        "@raze__winapi__0_3_9//:winapi",
     ],
 )
diff --git a/cargo/remote/scopeguard-1.1.0.BUILD.bazel b/cargo/remote/BUILD.scopeguard-1.1.0.bazel
similarity index 95%
rename from cargo/remote/scopeguard-1.1.0.BUILD.bazel
rename to cargo/remote/BUILD.scopeguard-1.1.0.bazel
index a2d8755c8..51671ca3f 100644
--- a/cargo/remote/scopeguard-1.1.0.BUILD.bazel
+++ b/cargo/remote/BUILD.scopeguard-1.1.0.bazel
@@ -28,28 +28,29 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "readme" with type "example" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "scopeguard",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "1.1.0",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "default",
         "use_std",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "1.1.0",
+    # buildifier: leave-alone
+    deps = [
+    ],
 )
diff --git a/cargo/remote/sct-0.6.0.BUILD.bazel b/cargo/remote/BUILD.sct-0.6.0.bazel
similarity index 95%
rename from cargo/remote/sct-0.6.0.BUILD.bazel
rename to cargo/remote/BUILD.sct-0.6.0.bazel
index 5a83f3146..733d57334 100644
--- a/cargo/remote/sct-0.6.0.BUILD.bazel
+++ b/cargo/remote/BUILD.sct-0.6.0.bazel
@@ -28,27 +28,27 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0 OR (ISC OR MIT)"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "sct",
-    crate_type = "lib",
-    deps = [
-        "@raze__ring__0_16_15//:ring",
-        "@raze__untrusted__0_7_1//:untrusted",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.6.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.6.0",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__ring__0_16_15//:ring",
+        "@raze__untrusted__0_7_1//:untrusted",
     ],
 )
diff --git a/cargo/remote/security-framework-1.0.0.BUILD.bazel b/cargo/remote/BUILD.security-framework-1.0.0.bazel
similarity index 96%
rename from cargo/remote/security-framework-1.0.0.BUILD.bazel
rename to cargo/remote/BUILD.security-framework-1.0.0.bazel
index cc8a0dfd3..5486bbbe3 100644
--- a/cargo/remote/security-framework-1.0.0.BUILD.bazel
+++ b/cargo/remote/BUILD.security-framework-1.0.0.bazel
@@ -28,14 +28,33 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "client" with type "example" omitted
+
 # Unsupported target "find_internet_password" with type "example" omitted
 
-# buildifier: leave-alone
+# Unsupported target "set_internet_password" with type "example" omitted
+
 rust_library(
     name = "security_framework",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "OSX_10_9",
+        "default",
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "1.0.0",
+    # buildifier: leave-alone
     deps = [
         "@raze__bitflags__1_2_1//:bitflags",
         "@raze__core_foundation__0_7_0//:core_foundation",
@@ -43,20 +62,4 @@ rust_library(
         "@raze__libc__0_2_80//:libc",
         "@raze__security_framework_sys__1_0_0//:security_framework_sys",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "1.0.0",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-        "OSX_10_9",
-        "default",
-    ],
 )
-# Unsupported target "set_internet_password" with type "example" omitted
diff --git a/cargo/remote/security-framework-sys-1.0.0.BUILD.bazel b/cargo/remote/BUILD.security-framework-sys-1.0.0.bazel
similarity index 95%
rename from cargo/remote/security-framework-sys-1.0.0.BUILD.bazel
rename to cargo/remote/BUILD.security-framework-sys-1.0.0.bazel
index 619d066b0..24bd9d4bc 100644
--- a/cargo/remote/security-framework-sys-1.0.0.BUILD.bazel
+++ b/cargo/remote/BUILD.security-framework-sys-1.0.0.bazel
@@ -28,28 +28,28 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "security_framework_sys",
-    crate_type = "lib",
-    deps = [
-        "@raze__core_foundation_sys__0_7_0//:core_foundation_sys",
-        "@raze__libc__0_2_80//:libc",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "OSX_10_9",
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "1.0.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
-        "OSX_10_9",
+    version = "1.0.0",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__core_foundation_sys__0_7_0//:core_foundation_sys",
+        "@raze__libc__0_2_80//:libc",
     ],
 )
diff --git a/cargo/remote/serde-1.0.117.BUILD.bazel b/cargo/remote/BUILD.serde-1.0.117.bazel
similarity index 90%
rename from cargo/remote/serde-1.0.117.BUILD.bazel
rename to cargo/remote/BUILD.serde-1.0.117.bazel
index 40077c4c8..c65a285f3 100644
--- a/cargo/remote/serde-1.0.117.BUILD.bazel
+++ b/cargo/remote/BUILD.serde-1.0.117.bazel
@@ -28,51 +28,50 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "serde_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build.rs",
-    edition = "2015",
-    deps = [
+    build_script_env = {
+    },
+    crate_features = [
+        "default",
+        "derive",
+        "serde_derive",
+        "std",
     ],
+    crate_root = "build.rs",
+    data = glob(["**"]),
+    edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    crate_features = [
-      "default",
-      "derive",
-      "serde_derive",
-      "std",
-    ],
-    build_script_env = {
-    },
-    data = glob(["**"]),
     tags = [
         "cargo-raze",
         "manual",
     ],
     version = "1.0.117",
     visibility = ["//visibility:private"],
+    deps = [
+    ],
 )
 
-
-# buildifier: leave-alone
 rust_library(
     name = "serde",
-    crate_type = "lib",
-    deps = [
-        ":serde_build_script",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "default",
+        "derive",
+        "serde_derive",
+        "std",
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     proc_macro_deps = [
         "@raze__serde_derive__1_0_117//:serde_derive",
@@ -80,15 +79,13 @@ rust_library(
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "1.0.117",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
-        "default",
-        "derive",
-        "serde_derive",
-        "std",
+    version = "1.0.117",
+    # buildifier: leave-alone
+    deps = [
+        ":serde_build_script",
     ],
 )
diff --git a/cargo/remote/serde-aux-0.6.1.BUILD.bazel b/cargo/remote/BUILD.serde-aux-0.6.1.bazel
similarity index 96%
rename from cargo/remote/serde-aux-0.6.1.BUILD.bazel
rename to cargo/remote/BUILD.serde-aux-0.6.1.bazel
index 76a8deceb..f9c6ef353 100644
--- a/cargo/remote/serde-aux-0.6.1.BUILD.bazel
+++ b/cargo/remote/BUILD.serde-aux-0.6.1.bazel
@@ -28,19 +28,17 @@ licenses([
     "notice",  # MIT from expression "MIT"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "serde_aux",
-    crate_type = "lib",
-    deps = [
-        "@raze__chrono__0_4_19//:chrono",
-        "@raze__serde__1_0_117//:serde",
-        "@raze__serde_json__1_0_59//:serde_json",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "chrono",
+        "default",
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     proc_macro_deps = [
         "@raze__serde_derive__1_0_117//:serde_derive",
@@ -48,13 +46,15 @@ rust_library(
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.6.1",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
-        "chrono",
-        "default",
+    version = "0.6.1",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__chrono__0_4_19//:chrono",
+        "@raze__serde__1_0_117//:serde",
+        "@raze__serde_json__1_0_59//:serde_json",
     ],
 )
diff --git a/cargo/remote/serde_derive-1.0.117.BUILD.bazel b/cargo/remote/BUILD.serde_derive-1.0.117.bazel
similarity index 93%
rename from cargo/remote/serde_derive-1.0.117.BUILD.bazel
rename to cargo/remote/BUILD.serde_derive-1.0.117.bazel
index b9e9c2317..dad3b9387 100644
--- a/cargo/remote/serde_derive-1.0.117.BUILD.bazel
+++ b/cargo/remote/BUILD.serde_derive-1.0.117.bazel
@@ -28,61 +28,58 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "serde_derive_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build.rs",
-    edition = "2015",
-    deps = [
+    build_script_env = {
+    },
+    crate_features = [
+        "default",
     ],
+    crate_root = "build.rs",
+    data = glob(["**"]),
+    edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    crate_features = [
-      "default",
-    ],
-    build_script_env = {
-    },
-    data = glob(["**"]),
     tags = [
         "cargo-raze",
         "manual",
     ],
     version = "1.0.117",
     visibility = ["//visibility:private"],
+    deps = [
+    ],
 )
 
-
-# buildifier: leave-alone
 rust_library(
     name = "serde_derive",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "default",
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "proc-macro",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "1.0.117",
+    # buildifier: leave-alone
     deps = [
         ":serde_derive_build_script",
         "@raze__proc_macro2__1_0_24//:proc_macro2",
         "@raze__quote__1_0_7//:quote",
         "@raze__syn__1_0_48//:syn",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "1.0.117",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-        "default",
-    ],
 )
diff --git a/cargo/remote/serde_json-1.0.59.BUILD.bazel b/cargo/remote/BUILD.serde_json-1.0.59.bazel
similarity index 92%
rename from cargo/remote/serde_json-1.0.59.BUILD.bazel
rename to cargo/remote/BUILD.serde_json-1.0.59.bazel
index 5f656d48e..7f2cc8375 100644
--- a/cargo/remote/serde_json-1.0.59.BUILD.bazel
+++ b/cargo/remote/BUILD.serde_json-1.0.59.bazel
@@ -28,63 +28,60 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "serde_json_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build.rs",
-    edition = "2018",
-    deps = [
+    build_script_env = {
+    },
+    crate_features = [
+        "default",
+        "std",
     ],
+    crate_root = "build.rs",
+    data = glob(["**"]),
+    edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    crate_features = [
-      "default",
-      "std",
-    ],
-    build_script_env = {
-    },
-    data = glob(["**"]),
     tags = [
         "cargo-raze",
         "manual",
     ],
     version = "1.0.59",
     visibility = ["//visibility:private"],
+    deps = [
+    ],
 )
 
-
-# buildifier: leave-alone
 rust_library(
     name = "serde_json",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "default",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "1.0.59",
+    # buildifier: leave-alone
     deps = [
         ":serde_json_build_script",
         "@raze__itoa__0_4_6//:itoa",
         "@raze__ryu__1_0_5//:ryu",
         "@raze__serde__1_0_117//:serde",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "1.0.59",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-        "default",
-        "std",
-    ],
 )
diff --git a/cargo/remote/serde_repr-0.1.6.BUILD.bazel b/cargo/remote/BUILD.serde_repr-0.1.6.bazel
similarity index 95%
rename from cargo/remote/serde_repr-0.1.6.BUILD.bazel
rename to cargo/remote/BUILD.serde_repr-0.1.6.bazel
index 55d2c6a9f..d2d2c73cf 100644
--- a/cargo/remote/serde_repr-0.1.6.BUILD.bazel
+++ b/cargo/remote/BUILD.serde_repr-0.1.6.bazel
@@ -28,30 +28,32 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# Unsupported target "compiletest" with type "test" omitted
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "serde_repr",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "proc-macro",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.1.6",
+    # buildifier: leave-alone
     deps = [
         "@raze__proc_macro2__1_0_24//:proc_macro2",
         "@raze__quote__1_0_7//:quote",
         "@raze__syn__1_0_48//:syn",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.1.6",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-    ],
 )
+
+# Unsupported target "compiletest" with type "test" omitted
+
 # Unsupported target "test" with type "test" omitted
diff --git a/cargo/remote/serde_tuple-0.5.0.BUILD.bazel b/cargo/remote/BUILD.serde_tuple-0.5.0.bazel
similarity index 95%
rename from cargo/remote/serde_tuple-0.5.0.BUILD.bazel
rename to cargo/remote/BUILD.serde_tuple-0.5.0.bazel
index da10b5e77..4bb006e37 100644
--- a/cargo/remote/serde_tuple-0.5.0.BUILD.bazel
+++ b/cargo/remote/BUILD.serde_tuple-0.5.0.bazel
@@ -28,17 +28,17 @@ licenses([
     "notice",  # MIT from expression "MIT"
 ])
 
-# Generated targets
+# Generated Targets
+
+# Unsupported target "simple" with type "example" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "serde_tuple",
-    crate_type = "lib",
-    deps = [
-        "@raze__serde__1_0_117//:serde",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     proc_macro_deps = [
         "@raze__serde_tuple_macros__0_5_0//:serde_tuple_macros",
@@ -46,12 +46,13 @@ rust_library(
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.5.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.5.0",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__serde__1_0_117//:serde",
     ],
 )
-# Unsupported target "simple" with type "example" omitted
diff --git a/cargo/remote/serde_tuple_macros-0.5.0.BUILD.bazel b/cargo/remote/BUILD.serde_tuple_macros-0.5.0.bazel
similarity index 95%
rename from cargo/remote/serde_tuple_macros-0.5.0.BUILD.bazel
rename to cargo/remote/BUILD.serde_tuple_macros-0.5.0.bazel
index 01b6ea9f3..fe22115d9 100644
--- a/cargo/remote/serde_tuple_macros-0.5.0.BUILD.bazel
+++ b/cargo/remote/BUILD.serde_tuple_macros-0.5.0.bazel
@@ -28,28 +28,28 @@ licenses([
     "notice",  # MIT from expression "MIT"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "serde_tuple_macros",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "proc-macro",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.5.0",
+    # buildifier: leave-alone
     deps = [
         "@raze__proc_macro2__1_0_24//:proc_macro2",
         "@raze__quote__1_0_7//:quote",
         "@raze__syn__1_0_48//:syn",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.5.0",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-    ],
 )
diff --git a/cargo/remote/serde_urlencoded-0.6.1.BUILD.bazel b/cargo/remote/BUILD.serde_urlencoded-0.6.1.bazel
similarity index 93%
rename from cargo/remote/serde_urlencoded-0.6.1.BUILD.bazel
rename to cargo/remote/BUILD.serde_urlencoded-0.6.1.bazel
index bd6993be6..fcfab6397 100644
--- a/cargo/remote/serde_urlencoded-0.6.1.BUILD.bazel
+++ b/cargo/remote/BUILD.serde_urlencoded-0.6.1.bazel
@@ -28,31 +28,33 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "serde_urlencoded",
-    crate_type = "lib",
-    deps = [
-        "@raze__dtoa__0_4_6//:dtoa",
-        "@raze__itoa__0_4_6//:itoa",
-        "@raze__serde__1_0_117//:serde",
-        "@raze__url__2_1_1//:url",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.6.1",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.6.1",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__dtoa__0_4_6//:dtoa",
+        "@raze__itoa__0_4_6//:itoa",
+        "@raze__serde__1_0_117//:serde",
+        "@raze__url__2_2_0//:url",
     ],
 )
+
 # Unsupported target "test_deserialize" with type "test" omitted
+
 # Unsupported target "test_serialize" with type "test" omitted
diff --git a/cargo/remote/sha1-0.6.0.BUILD.bazel b/cargo/remote/BUILD.sha1-0.6.0.bazel
similarity index 95%
rename from cargo/remote/sha1-0.6.0.BUILD.bazel
rename to cargo/remote/BUILD.sha1-0.6.0.bazel
index 5f514461b..7371b17e5 100644
--- a/cargo/remote/sha1-0.6.0.BUILD.bazel
+++ b/cargo/remote/BUILD.sha1-0.6.0.bazel
@@ -28,25 +28,25 @@ licenses([
     "notice",  # BSD-3-Clause from expression "BSD-3-Clause"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "sha1",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.6.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.6.0",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
diff --git a/cargo/remote/slab-0.4.2.BUILD.bazel b/cargo/remote/BUILD.slab-0.4.2.bazel
similarity index 95%
rename from cargo/remote/slab-0.4.2.BUILD.bazel
rename to cargo/remote/BUILD.slab-0.4.2.bazel
index 949a6d6bc..58bf7f91c 100644
--- a/cargo/remote/slab-0.4.2.BUILD.bazel
+++ b/cargo/remote/BUILD.slab-0.4.2.bazel
@@ -28,26 +28,27 @@ licenses([
     "notice",  # MIT from expression "MIT"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "slab",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.4.2",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.4.2",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
+
 # Unsupported target "slab" with type "test" omitted
diff --git a/cargo/remote/slog-2.5.2.BUILD.bazel b/cargo/remote/BUILD.slog-2.5.2.bazel
similarity index 90%
rename from cargo/remote/slog-2.5.2.BUILD.bazel
rename to cargo/remote/BUILD.slog-2.5.2.bazel
index 7c6486009..90ef31b2b 100644
--- a/cargo/remote/slog-2.5.2.BUILD.bazel
+++ b/cargo/remote/BUILD.slog-2.5.2.bazel
@@ -28,67 +28,67 @@ licenses([
     "notice",  # MIT from expression "MPL-2.0 OR (MIT OR Apache-2.0)"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "slog_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build.rs",
-    edition = "2015",
-    deps = [
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    crate_features = [
-      "default",
-      "max_level_trace",
-      "release_max_level_debug",
-      "std",
-    ],
     build_script_env = {
     },
-    data = glob(["**"]),
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    version = "2.5.2",
-    visibility = ["//visibility:private"],
-)
-
-# Unsupported target "named" with type "example" omitted
-# Unsupported target "singlethread" with type "example" omitted
-
-# buildifier: leave-alone
-rust_library(
-    name = "slog",
-    crate_type = "lib",
-    deps = [
-        ":slog_build_script",
-    ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "2.5.2",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "default",
         "max_level_trace",
         "release_max_level_debug",
         "std",
     ],
+    crate_root = "build.rs",
+    data = glob(["**"]),
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "2.5.2",
+    visibility = ["//visibility:private"],
+    deps = [
+    ],
 )
+
+# Unsupported target "named" with type "example" omitted
+
+# Unsupported target "singlethread" with type "example" omitted
+
 # Unsupported target "struct-log-self" with type "example" omitted
+
+rust_library(
+    name = "slog",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "default",
+        "max_level_trace",
+        "release_max_level_debug",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "2.5.2",
+    # buildifier: leave-alone
+    deps = [
+        ":slog_build_script",
+    ],
+)
diff --git a/cargo/remote/slog-async-2.5.0.BUILD.bazel b/cargo/remote/BUILD.slog-async-2.5.0.bazel
similarity index 95%
rename from cargo/remote/slog-async-2.5.0.BUILD.bazel
rename to cargo/remote/BUILD.slog-async-2.5.0.bazel
index c5ed09405..1f86a7340 100644
--- a/cargo/remote/slog-async-2.5.0.BUILD.bazel
+++ b/cargo/remote/BUILD.slog-async-2.5.0.bazel
@@ -28,30 +28,30 @@ licenses([
     "notice",  # MIT from expression "MPL-2.0 OR (MIT OR Apache-2.0)"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "slog_async",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "default",
+    ],
+    crate_root = "lib.rs",
     crate_type = "lib",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "2.5.0",
+    # buildifier: leave-alone
     deps = [
         "@raze__crossbeam_channel__0_4_4//:crossbeam_channel",
         "@raze__slog__2_5_2//:slog",
         "@raze__take_mut__0_2_2//:take_mut",
         "@raze__thread_local__1_0_1//:thread_local",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "lib.rs",
-    edition = "2015",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "2.5.0",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-        "default",
-    ],
 )
diff --git a/cargo/remote/slog-envlogger-2.2.0.BUILD.bazel b/cargo/remote/BUILD.slog-envlogger-2.2.0.bazel
similarity index 96%
rename from cargo/remote/slog-envlogger-2.2.0.BUILD.bazel
rename to cargo/remote/BUILD.slog-envlogger-2.2.0.bazel
index 276f969b9..94edc044b 100644
--- a/cargo/remote/slog-envlogger-2.2.0.BUILD.bazel
+++ b/cargo/remote/BUILD.slog-envlogger-2.2.0.bazel
@@ -28,16 +28,33 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "proper" with type "example" omitted
-# Unsupported target "regexp_filter" with type "test" omitted
+
 # Unsupported target "scopes" with type "example" omitted
+
 # Unsupported target "simple" with type "example" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "slog_envlogger",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "default",
+        "regex",
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "2.2.0",
+    # buildifier: leave-alone
     deps = [
         "@raze__log__0_4_11//:log",
         "@raze__regex__1_4_2//:regex",
@@ -47,19 +64,6 @@ rust_library(
         "@raze__slog_stdlog__4_1_0//:slog_stdlog",
         "@raze__slog_term__2_6_0//:slog_term",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "2.2.0",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-        "default",
-        "regex",
-    ],
 )
+
+# Unsupported target "regexp_filter" with type "test" omitted
diff --git a/cargo/remote/slog-scope-4.3.0.BUILD.bazel b/cargo/remote/BUILD.slog-scope-4.3.0.bazel
similarity index 95%
rename from cargo/remote/slog-scope-4.3.0.BUILD.bazel
rename to cargo/remote/BUILD.slog-scope-4.3.0.bazel
index f489a53b4..8dd07a14f 100644
--- a/cargo/remote/slog-scope-4.3.0.BUILD.bazel
+++ b/cargo/remote/BUILD.slog-scope-4.3.0.bazel
@@ -28,29 +28,30 @@ licenses([
     "notice",  # MIT from expression "MPL-2.0 OR (MIT OR Apache-2.0)"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "compact-color" with type "example" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "slog_scope",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
+    crate_root = "lib.rs",
     crate_type = "lib",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "4.3.0",
+    # buildifier: leave-alone
     deps = [
         "@raze__arc_swap__0_4_7//:arc_swap",
         "@raze__lazy_static__1_4_0//:lazy_static",
         "@raze__slog__2_5_2//:slog",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "lib.rs",
-    edition = "2015",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "4.3.0",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-    ],
 )
diff --git a/cargo/remote/slog-stdlog-4.1.0.BUILD.bazel b/cargo/remote/BUILD.slog-stdlog-4.1.0.bazel
similarity index 95%
rename from cargo/remote/slog-stdlog-4.1.0.BUILD.bazel
rename to cargo/remote/BUILD.slog-stdlog-4.1.0.bazel
index 9da6a53ef..4f7806b25 100644
--- a/cargo/remote/slog-stdlog-4.1.0.BUILD.bazel
+++ b/cargo/remote/BUILD.slog-stdlog-4.1.0.bazel
@@ -28,28 +28,28 @@ licenses([
     "notice",  # MIT from expression "MPL-2.0 OR (MIT OR Apache-2.0)"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "slog_stdlog",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
+    crate_root = "lib.rs",
     crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "4.1.0",
+    # buildifier: leave-alone
     deps = [
         "@raze__log__0_4_11//:log",
         "@raze__slog__2_5_2//:slog",
         "@raze__slog_scope__4_3_0//:slog_scope",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "4.1.0",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-    ],
 )
diff --git a/cargo/remote/slog-term-2.6.0.BUILD.bazel b/cargo/remote/BUILD.slog-term-2.6.0.bazel
similarity index 96%
rename from cargo/remote/slog-term-2.6.0.BUILD.bazel
rename to cargo/remote/BUILD.slog-term-2.6.0.bazel
index de6cc14cd..d0cf55e1a 100644
--- a/cargo/remote/slog-term-2.6.0.BUILD.bazel
+++ b/cargo/remote/BUILD.slog-term-2.6.0.bazel
@@ -28,17 +28,37 @@ licenses([
     "notice",  # MIT from expression "MPL-2.0 OR (MIT OR Apache-2.0)"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "compact" with type "example" omitted
+
 # Unsupported target "compact-color" with type "example" omitted
+
 # Unsupported target "full" with type "example" omitted
+
 # Unsupported target "full-color" with type "example" omitted
+
 # Unsupported target "full-color-oorder" with type "example" omitted
 
-# buildifier: leave-alone
+# Unsupported target "to-file" with type "example" omitted
+
 rust_library(
     name = "slog_term",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "2.6.0",
+    # buildifier: leave-alone
     deps = [
         "@raze__atty__0_2_14//:atty",
         "@raze__chrono__0_4_19//:chrono",
@@ -46,19 +66,6 @@ rust_library(
         "@raze__term__0_6_1//:term",
         "@raze__thread_local__1_0_1//:thread_local",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "2.6.0",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-    ],
 )
+
 # Unsupported target "term" with type "test" omitted
-# Unsupported target "to-file" with type "example" omitted
diff --git a/cargo/remote/smallvec-1.4.2.BUILD.bazel b/cargo/remote/BUILD.smallvec-1.4.2.bazel
similarity index 95%
rename from cargo/remote/smallvec-1.4.2.BUILD.bazel
rename to cargo/remote/BUILD.smallvec-1.4.2.bazel
index 68f89abe0..2f2a558de 100644
--- a/cargo/remote/smallvec-1.4.2.BUILD.bazel
+++ b/cargo/remote/BUILD.smallvec-1.4.2.bazel
@@ -28,27 +28,29 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# Unsupported target "bench" with type "bench" omitted
-# Unsupported target "macro" with type "test" omitted
+# Generated Targets
+
+# Unsupported target "bench" with type "bench" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "smallvec",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "1.4.2",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "1.4.2",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
+
+# Unsupported target "macro" with type "test" omitted
diff --git a/cargo/remote/socket2-0.3.15.BUILD.bazel b/cargo/remote/BUILD.socket2-0.3.15.bazel
similarity index 97%
rename from cargo/remote/socket2-0.3.15.BUILD.bazel
rename to cargo/remote/BUILD.socket2-0.3.15.bazel
index 357460bc9..c4c45b357 100644
--- a/cargo/remote/socket2-0.3.15.BUILD.bazel
+++ b/cargo/remote/BUILD.socket2-0.3.15.bazel
@@ -28,12 +28,27 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "socket2",
+    srcs = glob(["**/*.rs"]),
+    aliases = {
+    },
+    crate_features = [
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.3.15",
+    # buildifier: leave-alone
     deps = [
     ] + selects.with_or({
         # cfg(any(unix, target_os = "redox"))
@@ -59,19 +74,4 @@ rust_library(
         ],
         "//conditions:default": [],
     }),
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.3.15",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-    ],
-    aliases = {
-    },
 )
diff --git a/cargo/remote/spin-0.5.2.BUILD.bazel b/cargo/remote/BUILD.spin-0.5.2.bazel
similarity index 95%
rename from cargo/remote/spin-0.5.2.BUILD.bazel
rename to cargo/remote/BUILD.spin-0.5.2.bazel
index 0423e4523..36344bbb4 100644
--- a/cargo/remote/spin-0.5.2.BUILD.bazel
+++ b/cargo/remote/BUILD.spin-0.5.2.bazel
@@ -28,26 +28,27 @@ licenses([
     "notice",  # MIT from expression "MIT"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "debug" with type "example" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "spin",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.5.2",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.5.2",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
diff --git a/cargo/remote/stable_deref_trait-1.2.0.BUILD.bazel b/cargo/remote/BUILD.stable_deref_trait-1.2.0.bazel
similarity index 95%
rename from cargo/remote/stable_deref_trait-1.2.0.BUILD.bazel
rename to cargo/remote/BUILD.stable_deref_trait-1.2.0.bazel
index 09a9a662e..61e163a5b 100644
--- a/cargo/remote/stable_deref_trait-1.2.0.BUILD.bazel
+++ b/cargo/remote/BUILD.stable_deref_trait-1.2.0.bazel
@@ -28,27 +28,27 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "stable_deref_trait",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "1.2.0",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "alloc",
         "std",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "1.2.0",
+    # buildifier: leave-alone
+    deps = [
+    ],
 )
diff --git a/cargo/remote/static_assertions-1.1.0.BUILD.bazel b/cargo/remote/BUILD.static_assertions-1.1.0.bazel
similarity index 95%
rename from cargo/remote/static_assertions-1.1.0.BUILD.bazel
rename to cargo/remote/BUILD.static_assertions-1.1.0.bazel
index 8ab446e3b..b323053b6 100644
--- a/cargo/remote/static_assertions-1.1.0.BUILD.bazel
+++ b/cargo/remote/BUILD.static_assertions-1.1.0.bazel
@@ -28,25 +28,25 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "static_assertions",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "1.1.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "1.1.0",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
diff --git a/cargo/remote/subtle-2.3.0.BUILD.bazel b/cargo/remote/BUILD.subtle-2.3.0.bazel
similarity index 95%
rename from cargo/remote/subtle-2.3.0.BUILD.bazel
rename to cargo/remote/BUILD.subtle-2.3.0.bazel
index 934ef22f0..88bf35cb7 100644
--- a/cargo/remote/subtle-2.3.0.BUILD.bazel
+++ b/cargo/remote/BUILD.subtle-2.3.0.bazel
@@ -28,26 +28,27 @@ licenses([
     "notice",  # BSD-3-Clause from expression "BSD-3-Clause"
 ])
 
-# Generated targets
-# Unsupported target "mod" with type "test" omitted
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "subtle",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "2.3.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "2.3.0",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
+
+# Unsupported target "mod" with type "test" omitted
diff --git a/cargo/remote/syn-1.0.48.BUILD.bazel b/cargo/remote/BUILD.syn-1.0.48.bazel
similarity index 91%
rename from cargo/remote/syn-1.0.48.BUILD.bazel
rename to cargo/remote/BUILD.syn-1.0.48.bazel
index 3b8c3c125..2a42232ac 100644
--- a/cargo/remote/syn-1.0.48.BUILD.bazel
+++ b/cargo/remote/BUILD.syn-1.0.48.bazel
@@ -28,73 +28,17 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "syn_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build.rs",
-    edition = "2018",
-    deps = [
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    crate_features = [
-      "clone-impls",
-      "default",
-      "derive",
-      "extra-traits",
-      "fold",
-      "full",
-      "parsing",
-      "printing",
-      "proc-macro",
-      "quote",
-      "visit",
-      "visit-mut",
-    ],
     build_script_env = {
     },
-    data = glob(["**"]),
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    version = "1.0.48",
-    visibility = ["//visibility:private"],
-)
-
-# Unsupported target "file" with type "bench" omitted
-# Unsupported target "rust" with type "bench" omitted
-
-# buildifier: leave-alone
-rust_library(
-    name = "syn",
-    crate_type = "lib",
-    deps = [
-        ":syn_build_script",
-        "@raze__proc_macro2__1_0_24//:proc_macro2",
-        "@raze__quote__1_0_7//:quote",
-        "@raze__unicode_xid__0_2_1//:unicode_xid",
-    ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "1.0.48",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "clone-impls",
         "default",
@@ -109,30 +53,111 @@ rust_library(
         "visit",
         "visit-mut",
     ],
+    crate_root = "build.rs",
+    data = glob(["**"]),
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "1.0.48",
+    visibility = ["//visibility:private"],
+    deps = [
+    ],
 )
+
+# Unsupported target "file" with type "bench" omitted
+
+# Unsupported target "rust" with type "bench" omitted
+
+rust_library(
+    name = "syn",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "clone-impls",
+        "default",
+        "derive",
+        "extra-traits",
+        "fold",
+        "full",
+        "parsing",
+        "printing",
+        "proc-macro",
+        "quote",
+        "visit",
+        "visit-mut",
+    ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "1.0.48",
+    # buildifier: leave-alone
+    deps = [
+        ":syn_build_script",
+        "@raze__proc_macro2__1_0_24//:proc_macro2",
+        "@raze__quote__1_0_7//:quote",
+        "@raze__unicode_xid__0_2_1//:unicode_xid",
+    ],
+)
+
 # Unsupported target "test_asyncness" with type "test" omitted
+
 # Unsupported target "test_attribute" with type "test" omitted
+
 # Unsupported target "test_derive_input" with type "test" omitted
+
 # Unsupported target "test_expr" with type "test" omitted
+
 # Unsupported target "test_generics" with type "test" omitted
+
 # Unsupported target "test_grouping" with type "test" omitted
+
 # Unsupported target "test_ident" with type "test" omitted
+
 # Unsupported target "test_item" with type "test" omitted
+
 # Unsupported target "test_iterators" with type "test" omitted
+
 # Unsupported target "test_lit" with type "test" omitted
+
 # Unsupported target "test_meta" with type "test" omitted
+
 # Unsupported target "test_parse_buffer" with type "test" omitted
+
 # Unsupported target "test_parse_stream" with type "test" omitted
+
 # Unsupported target "test_pat" with type "test" omitted
+
 # Unsupported target "test_path" with type "test" omitted
+
 # Unsupported target "test_precedence" with type "test" omitted
+
 # Unsupported target "test_receiver" with type "test" omitted
+
 # Unsupported target "test_round_trip" with type "test" omitted
+
 # Unsupported target "test_shebang" with type "test" omitted
+
 # Unsupported target "test_should_parse" with type "test" omitted
+
 # Unsupported target "test_size" with type "test" omitted
+
 # Unsupported target "test_stmt" with type "test" omitted
+
 # Unsupported target "test_token_trees" with type "test" omitted
+
 # Unsupported target "test_ty" with type "test" omitted
+
 # Unsupported target "test_visibility" with type "test" omitted
+
 # Unsupported target "zzz_stable" with type "test" omitted
diff --git a/cargo/remote/synstructure-0.12.4.BUILD.bazel b/cargo/remote/BUILD.synstructure-0.12.4.bazel
similarity index 95%
rename from cargo/remote/synstructure-0.12.4.BUILD.bazel
rename to cargo/remote/BUILD.synstructure-0.12.4.bazel
index 80d7031e9..50a496a73 100644
--- a/cargo/remote/synstructure-0.12.4.BUILD.bazel
+++ b/cargo/remote/BUILD.synstructure-0.12.4.bazel
@@ -28,31 +28,31 @@ licenses([
     "notice",  # MIT from expression "MIT"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "synstructure",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "default",
+        "proc-macro",
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.12.4",
+    # buildifier: leave-alone
     deps = [
         "@raze__proc_macro2__1_0_24//:proc_macro2",
         "@raze__quote__1_0_7//:quote",
         "@raze__syn__1_0_48//:syn",
         "@raze__unicode_xid__0_2_1//:unicode_xid",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.12.4",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-        "default",
-        "proc-macro",
-    ],
 )
diff --git a/cargo/remote/take_mut-0.2.2.BUILD.bazel b/cargo/remote/BUILD.take_mut-0.2.2.bazel
similarity index 95%
rename from cargo/remote/take_mut-0.2.2.BUILD.bazel
rename to cargo/remote/BUILD.take_mut-0.2.2.bazel
index 3338dcad7..6640008e4 100644
--- a/cargo/remote/take_mut-0.2.2.BUILD.bazel
+++ b/cargo/remote/BUILD.take_mut-0.2.2.bazel
@@ -28,25 +28,25 @@ licenses([
     "notice",  # MIT from expression "MIT"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "take_mut",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.2.2",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.2.2",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
diff --git a/cargo/remote/tempfile-3.1.0.BUILD.bazel b/cargo/remote/BUILD.tempfile-3.1.0.bazel
similarity index 97%
rename from cargo/remote/tempfile-3.1.0.BUILD.bazel
rename to cargo/remote/BUILD.tempfile-3.1.0.bazel
index 5e4b75b0d..b76bf7ace 100644
--- a/cargo/remote/tempfile-3.1.0.BUILD.bazel
+++ b/cargo/remote/BUILD.tempfile-3.1.0.bazel
@@ -28,15 +28,27 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# Unsupported target "namedtempfile" with type "test" omitted
-# Unsupported target "spooled" with type "test" omitted
-# Unsupported target "tempdir" with type "test" omitted
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "tempfile",
+    srcs = glob(["**/*.rs"]),
+    aliases = {
+    },
+    crate_features = [
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "3.1.0",
+    # buildifier: leave-alone
     deps = [
         "@raze__cfg_if__0_1_10//:cfg_if",
         "@raze__rand__0_7_3//:rand",
@@ -64,20 +76,12 @@ rust_library(
         ],
         "//conditions:default": [],
     }),
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "3.1.0",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-    ],
-    aliases = {
-    },
 )
+
+# Unsupported target "namedtempfile" with type "test" omitted
+
+# Unsupported target "spooled" with type "test" omitted
+
+# Unsupported target "tempdir" with type "test" omitted
+
 # Unsupported target "tempfile" with type "test" omitted
diff --git a/cargo/remote/term-0.6.1.BUILD.bazel b/cargo/remote/BUILD.term-0.6.1.bazel
similarity index 96%
rename from cargo/remote/term-0.6.1.BUILD.bazel
rename to cargo/remote/BUILD.term-0.6.1.bazel
index b58c11059..23bc71803 100644
--- a/cargo/remote/term-0.6.1.BUILD.bazel
+++ b/cargo/remote/BUILD.term-0.6.1.bazel
@@ -28,12 +28,28 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "term",
+    srcs = glob(["**/*.rs"]),
+    aliases = {
+    },
+    crate_features = [
+        "default",
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.6.1",
+    # buildifier: leave-alone
     deps = [
         "@raze__dirs__2_0_2//:dirs",
     ] + selects.with_or({
@@ -46,21 +62,6 @@ rust_library(
         ],
         "//conditions:default": [],
     }),
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.6.1",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-        "default",
-    ],
-    aliases = {
-    },
 )
+
 # Unsupported target "terminfo" with type "test" omitted
diff --git a/cargo/remote/termcolor-1.1.0.BUILD.bazel b/cargo/remote/BUILD.termcolor-1.1.0.bazel
similarity index 96%
rename from cargo/remote/termcolor-1.1.0.BUILD.bazel
rename to cargo/remote/BUILD.termcolor-1.1.0.bazel
index 996a1f43f..7d58109c6 100644
--- a/cargo/remote/termcolor-1.1.0.BUILD.bazel
+++ b/cargo/remote/BUILD.termcolor-1.1.0.bazel
@@ -28,12 +28,27 @@ licenses([
     "unencumbered",  # Unlicense from expression "Unlicense OR MIT"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "termcolor",
+    srcs = glob(["**/*.rs"]),
+    aliases = {
+    },
+    crate_features = [
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "1.1.0",
+    # buildifier: leave-alone
     deps = [
     ] + selects.with_or({
         # cfg(windows)
@@ -45,19 +60,4 @@ rust_library(
         ],
         "//conditions:default": [],
     }),
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "1.1.0",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-    ],
-    aliases = {
-    },
 )
diff --git a/cargo/remote/thiserror-1.0.21.BUILD.bazel b/cargo/remote/BUILD.thiserror-1.0.22.bazel
similarity index 92%
rename from cargo/remote/thiserror-1.0.21.BUILD.bazel
rename to cargo/remote/BUILD.thiserror-1.0.22.bazel
index 8d5d2750b..e1a0fa092 100644
--- a/cargo/remote/thiserror-1.0.21.BUILD.bazel
+++ b/cargo/remote/BUILD.thiserror-1.0.22.bazel
@@ -28,40 +28,52 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# Unsupported target "compiletest" with type "test" omitted
-# Unsupported target "test_backtrace" with type "test" omitted
-# Unsupported target "test_deprecated" with type "test" omitted
-# Unsupported target "test_display" with type "test" omitted
-# Unsupported target "test_error" with type "test" omitted
-# Unsupported target "test_expr" with type "test" omitted
-# Unsupported target "test_from" with type "test" omitted
-# Unsupported target "test_lints" with type "test" omitted
-# Unsupported target "test_option" with type "test" omitted
-# Unsupported target "test_path" with type "test" omitted
-# Unsupported target "test_source" with type "test" omitted
-# Unsupported target "test_transparent" with type "test" omitted
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "thiserror",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     proc_macro_deps = [
-        "@raze__thiserror_impl__1_0_21//:thiserror_impl",
+        "@raze__thiserror_impl__1_0_22//:thiserror_impl",
     ],
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "1.0.21",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "1.0.22",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
+
+# Unsupported target "compiletest" with type "test" omitted
+
+# Unsupported target "test_backtrace" with type "test" omitted
+
+# Unsupported target "test_deprecated" with type "test" omitted
+
+# Unsupported target "test_display" with type "test" omitted
+
+# Unsupported target "test_error" with type "test" omitted
+
+# Unsupported target "test_expr" with type "test" omitted
+
+# Unsupported target "test_from" with type "test" omitted
+
+# Unsupported target "test_lints" with type "test" omitted
+
+# Unsupported target "test_option" with type "test" omitted
+
+# Unsupported target "test_path" with type "test" omitted
+
+# Unsupported target "test_source" with type "test" omitted
+
+# Unsupported target "test_transparent" with type "test" omitted
diff --git a/cargo/remote/thiserror-impl-1.0.21.BUILD.bazel b/cargo/remote/BUILD.thiserror-impl-1.0.22.bazel
similarity index 93%
rename from cargo/remote/thiserror-impl-1.0.21.BUILD.bazel
rename to cargo/remote/BUILD.thiserror-impl-1.0.22.bazel
index 000597023..938a5f38c 100644
--- a/cargo/remote/thiserror-impl-1.0.21.BUILD.bazel
+++ b/cargo/remote/BUILD.thiserror-impl-1.0.22.bazel
@@ -28,28 +28,28 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "thiserror_impl",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "proc-macro",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "1.0.22",
+    # buildifier: leave-alone
     deps = [
         "@raze__proc_macro2__1_0_24//:proc_macro2",
         "@raze__quote__1_0_7//:quote",
         "@raze__syn__1_0_48//:syn",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "1.0.21",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-    ],
 )
diff --git a/cargo/remote/thread_local-1.0.1.BUILD.bazel b/cargo/remote/BUILD.thread_local-1.0.1.bazel
similarity index 95%
rename from cargo/remote/thread_local-1.0.1.BUILD.bazel
rename to cargo/remote/BUILD.thread_local-1.0.1.bazel
index 98c6a06f5..3ee73f01e 100644
--- a/cargo/remote/thread_local-1.0.1.BUILD.bazel
+++ b/cargo/remote/BUILD.thread_local-1.0.1.bazel
@@ -28,27 +28,28 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0 OR MIT"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "thread_local" with type "bench" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "thread_local",
-    crate_type = "lib",
-    deps = [
-        "@raze__lazy_static__1_4_0//:lazy_static",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "1.0.1",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "1.0.1",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__lazy_static__1_4_0//:lazy_static",
     ],
 )
diff --git a/cargo/remote/time-0.1.44.BUILD.bazel b/cargo/remote/BUILD.time-0.1.44.bazel
similarity index 96%
rename from cargo/remote/time-0.1.44.BUILD.bazel
rename to cargo/remote/BUILD.time-0.1.44.bazel
index dcfc80c24..01b3319d4 100644
--- a/cargo/remote/time-0.1.44.BUILD.bazel
+++ b/cargo/remote/BUILD.time-0.1.44.bazel
@@ -28,12 +28,27 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "time",
+    srcs = glob(["**/*.rs"]),
+    aliases = {
+    },
+    crate_features = [
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.1.44",
+    # buildifier: leave-alone
     deps = [
         "@raze__libc__0_2_80//:libc",
     ] + selects.with_or({
@@ -46,19 +61,4 @@ rust_library(
         ],
         "//conditions:default": [],
     }),
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.1.44",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-    ],
-    aliases = {
-    },
 )
diff --git a/cargo/remote/tinystr-0.3.4.BUILD.bazel b/cargo/remote/BUILD.tinystr-0.3.4.bazel
similarity index 95%
rename from cargo/remote/tinystr-0.3.4.BUILD.bazel
rename to cargo/remote/BUILD.tinystr-0.3.4.bazel
index 52aa522e2..50d495aaf 100644
--- a/cargo/remote/tinystr-0.3.4.BUILD.bazel
+++ b/cargo/remote/BUILD.tinystr-0.3.4.bazel
@@ -28,31 +28,35 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0 OR MIT"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "construct" with type "bench" omitted
-# Unsupported target "main" with type "example" omitted
-# Unsupported target "main" with type "test" omitted
+
 # Unsupported target "tinystr" with type "bench" omitted
 
-# buildifier: leave-alone
+# Unsupported target "main" with type "example" omitted
+
 rust_library(
     name = "tinystr",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.3.4",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "default",
         "std",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.3.4",
+    # buildifier: leave-alone
+    deps = [
+    ],
 )
+
+# Unsupported target "main" with type "test" omitted
diff --git a/cargo/remote/tinyvec-0.3.4.BUILD.bazel b/cargo/remote/BUILD.tinyvec-0.3.4.bazel
similarity index 95%
rename from cargo/remote/tinyvec-0.3.4.BUILD.bazel
rename to cargo/remote/BUILD.tinyvec-0.3.4.bazel
index 4b746cc55..84505ea56 100644
--- a/cargo/remote/tinyvec-0.3.4.BUILD.bazel
+++ b/cargo/remote/BUILD.tinyvec-0.3.4.bazel
@@ -28,30 +28,33 @@ licenses([
     "notice",  # Zlib from expression "Zlib OR (Apache-2.0 OR MIT)"
 ])
 
-# Generated targets
-# Unsupported target "arrayvec" with type "test" omitted
+# Generated Targets
+
 # Unsupported target "macros" with type "bench" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "tinyvec",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.3.4",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "alloc",
         "default",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.3.4",
+    # buildifier: leave-alone
+    deps = [
+    ],
 )
+
+# Unsupported target "arrayvec" with type "test" omitted
+
 # Unsupported target "tinyvec" with type "test" omitted
diff --git a/cargo/remote/tokio-0.2.22.BUILD.bazel b/cargo/remote/BUILD.tokio-0.2.22.bazel
similarity index 97%
rename from cargo/remote/tokio-0.2.22.BUILD.bazel
rename to cargo/remote/BUILD.tokio-0.2.22.bazel
index 6368f63a7..6ad4da0a9 100644
--- a/cargo/remote/tokio-0.2.22.BUILD.bazel
+++ b/cargo/remote/BUILD.tokio-0.2.22.bazel
@@ -28,108 +28,50 @@ licenses([
     "notice",  # MIT from expression "MIT"
 ])
 
-# Generated targets
-# Unsupported target "_require_full" with type "test" omitted
-# Unsupported target "async_send_sync" with type "test" omitted
-# Unsupported target "buffered" with type "test" omitted
-# Unsupported target "fs" with type "test" omitted
-# Unsupported target "fs_copy" with type "test" omitted
-# Unsupported target "fs_dir" with type "test" omitted
-# Unsupported target "fs_file" with type "test" omitted
-# Unsupported target "fs_file_mocked" with type "test" omitted
-# Unsupported target "fs_link" with type "test" omitted
-# Unsupported target "io_async_read" with type "test" omitted
-# Unsupported target "io_chain" with type "test" omitted
-# Unsupported target "io_copy" with type "test" omitted
-# Unsupported target "io_driver" with type "test" omitted
-# Unsupported target "io_driver_drop" with type "test" omitted
-# Unsupported target "io_lines" with type "test" omitted
-# Unsupported target "io_read" with type "test" omitted
-# Unsupported target "io_read_exact" with type "test" omitted
-# Unsupported target "io_read_line" with type "test" omitted
-# Unsupported target "io_read_to_end" with type "test" omitted
-# Unsupported target "io_read_to_string" with type "test" omitted
-# Unsupported target "io_read_until" with type "test" omitted
-# Unsupported target "io_split" with type "test" omitted
-# Unsupported target "io_take" with type "test" omitted
-# Unsupported target "io_write" with type "test" omitted
-# Unsupported target "io_write_all" with type "test" omitted
-# Unsupported target "io_write_int" with type "test" omitted
-# Unsupported target "macros_join" with type "test" omitted
-# Unsupported target "macros_pin" with type "test" omitted
-# Unsupported target "macros_select" with type "test" omitted
-# Unsupported target "macros_test" with type "test" omitted
-# Unsupported target "macros_try_join" with type "test" omitted
-# Unsupported target "net_bind_resource" with type "test" omitted
-# Unsupported target "net_lookup_host" with type "test" omitted
-# Unsupported target "no_rt" with type "test" omitted
-# Unsupported target "process_issue_2174" with type "test" omitted
-# Unsupported target "process_issue_42" with type "test" omitted
-# Unsupported target "process_kill_on_drop" with type "test" omitted
-# Unsupported target "process_smoke" with type "test" omitted
-# Unsupported target "read_to_string" with type "test" omitted
-# Unsupported target "rt_basic" with type "test" omitted
-# Unsupported target "rt_common" with type "test" omitted
-# Unsupported target "rt_threaded" with type "test" omitted
-# Unsupported target "signal_ctrl_c" with type "test" omitted
-# Unsupported target "signal_drop_recv" with type "test" omitted
-# Unsupported target "signal_drop_rt" with type "test" omitted
-# Unsupported target "signal_drop_signal" with type "test" omitted
-# Unsupported target "signal_multi_rt" with type "test" omitted
-# Unsupported target "signal_no_rt" with type "test" omitted
-# Unsupported target "signal_notify_both" with type "test" omitted
-# Unsupported target "signal_twice" with type "test" omitted
-# Unsupported target "signal_usr1" with type "test" omitted
-# Unsupported target "stream_chain" with type "test" omitted
-# Unsupported target "stream_collect" with type "test" omitted
-# Unsupported target "stream_empty" with type "test" omitted
-# Unsupported target "stream_fuse" with type "test" omitted
-# Unsupported target "stream_iter" with type "test" omitted
-# Unsupported target "stream_merge" with type "test" omitted
-# Unsupported target "stream_once" with type "test" omitted
-# Unsupported target "stream_pending" with type "test" omitted
-# Unsupported target "stream_reader" with type "test" omitted
-# Unsupported target "stream_stream_map" with type "test" omitted
-# Unsupported target "stream_timeout" with type "test" omitted
-# Unsupported target "sync_barrier" with type "test" omitted
-# Unsupported target "sync_broadcast" with type "test" omitted
-# Unsupported target "sync_cancellation_token" with type "test" omitted
-# Unsupported target "sync_errors" with type "test" omitted
-# Unsupported target "sync_mpsc" with type "test" omitted
-# Unsupported target "sync_mutex" with type "test" omitted
-# Unsupported target "sync_mutex_owned" with type "test" omitted
-# Unsupported target "sync_notify" with type "test" omitted
-# Unsupported target "sync_oneshot" with type "test" omitted
-# Unsupported target "sync_rwlock" with type "test" omitted
-# Unsupported target "sync_semaphore" with type "test" omitted
-# Unsupported target "sync_semaphore_owned" with type "test" omitted
-# Unsupported target "sync_watch" with type "test" omitted
-# Unsupported target "task_blocking" with type "test" omitted
-# Unsupported target "task_local" with type "test" omitted
-# Unsupported target "task_local_set" with type "test" omitted
-# Unsupported target "tcp_accept" with type "test" omitted
-# Unsupported target "tcp_connect" with type "test" omitted
-# Unsupported target "tcp_echo" with type "test" omitted
-# Unsupported target "tcp_into_split" with type "test" omitted
-# Unsupported target "tcp_peek" with type "test" omitted
-# Unsupported target "tcp_shutdown" with type "test" omitted
-# Unsupported target "tcp_split" with type "test" omitted
-# Unsupported target "test_clock" with type "test" omitted
-# Unsupported target "time_delay" with type "test" omitted
-# Unsupported target "time_delay_queue" with type "test" omitted
-# Unsupported target "time_interval" with type "test" omitted
-# Unsupported target "time_rt" with type "test" omitted
-# Unsupported target "time_throttle" with type "test" omitted
-# Unsupported target "time_timeout" with type "test" omitted
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "tokio",
+    srcs = glob(["**/*.rs"]),
+    aliases = {
+    },
+    crate_features = [
+        "blocking",
+        "default",
+        "fnv",
+        "fs",
+        "futures-core",
+        "io-driver",
+        "io-util",
+        "iovec",
+        "lazy_static",
+        "memchr",
+        "mio",
+        "num_cpus",
+        "rt-core",
+        "rt-threaded",
+        "slab",
+        "stream",
+        "sync",
+        "tcp",
+        "time",
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.2.22",
+    # buildifier: leave-alone
     deps = [
         "@raze__bytes__0_5_6//:bytes",
         "@raze__fnv__1_0_7//:fnv",
-        "@raze__futures_core__0_3_7//:futures_core",
+        "@raze__futures_core__0_3_8//:futures_core",
         "@raze__iovec__0_1_4//:iovec",
         "@raze__lazy_static__1_4_0//:lazy_static",
         "@raze__memchr__2_3_4//:memchr",
@@ -158,43 +100,198 @@ rust_library(
         ],
         "//conditions:default": [],
     }),
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.2.22",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-        "blocking",
-        "default",
-        "fnv",
-        "fs",
-        "futures-core",
-        "io-driver",
-        "io-util",
-        "iovec",
-        "lazy_static",
-        "memchr",
-        "mio",
-        "num_cpus",
-        "rt-core",
-        "rt-threaded",
-        "slab",
-        "stream",
-        "sync",
-        "tcp",
-        "time",
-    ],
-    aliases = {
-    },
 )
+
+# Unsupported target "_require_full" with type "test" omitted
+
+# Unsupported target "async_send_sync" with type "test" omitted
+
+# Unsupported target "buffered" with type "test" omitted
+
+# Unsupported target "fs" with type "test" omitted
+
+# Unsupported target "fs_copy" with type "test" omitted
+
+# Unsupported target "fs_dir" with type "test" omitted
+
+# Unsupported target "fs_file" with type "test" omitted
+
+# Unsupported target "fs_file_mocked" with type "test" omitted
+
+# Unsupported target "fs_link" with type "test" omitted
+
+# Unsupported target "io_async_read" with type "test" omitted
+
+# Unsupported target "io_chain" with type "test" omitted
+
+# Unsupported target "io_copy" with type "test" omitted
+
+# Unsupported target "io_driver" with type "test" omitted
+
+# Unsupported target "io_driver_drop" with type "test" omitted
+
+# Unsupported target "io_lines" with type "test" omitted
+
+# Unsupported target "io_read" with type "test" omitted
+
+# Unsupported target "io_read_exact" with type "test" omitted
+
+# Unsupported target "io_read_line" with type "test" omitted
+
+# Unsupported target "io_read_to_end" with type "test" omitted
+
+# Unsupported target "io_read_to_string" with type "test" omitted
+
+# Unsupported target "io_read_until" with type "test" omitted
+
+# Unsupported target "io_split" with type "test" omitted
+
+# Unsupported target "io_take" with type "test" omitted
+
+# Unsupported target "io_write" with type "test" omitted
+
+# Unsupported target "io_write_all" with type "test" omitted
+
+# Unsupported target "io_write_int" with type "test" omitted
+
+# Unsupported target "macros_join" with type "test" omitted
+
+# Unsupported target "macros_pin" with type "test" omitted
+
+# Unsupported target "macros_select" with type "test" omitted
+
+# Unsupported target "macros_test" with type "test" omitted
+
+# Unsupported target "macros_try_join" with type "test" omitted
+
+# Unsupported target "net_bind_resource" with type "test" omitted
+
+# Unsupported target "net_lookup_host" with type "test" omitted
+
+# Unsupported target "no_rt" with type "test" omitted
+
+# Unsupported target "process_issue_2174" with type "test" omitted
+
+# Unsupported target "process_issue_42" with type "test" omitted
+
+# Unsupported target "process_kill_on_drop" with type "test" omitted
+
+# Unsupported target "process_smoke" with type "test" omitted
+
+# Unsupported target "read_to_string" with type "test" omitted
+
+# Unsupported target "rt_basic" with type "test" omitted
+
+# Unsupported target "rt_common" with type "test" omitted
+
+# Unsupported target "rt_threaded" with type "test" omitted
+
+# Unsupported target "signal_ctrl_c" with type "test" omitted
+
+# Unsupported target "signal_drop_recv" with type "test" omitted
+
+# Unsupported target "signal_drop_rt" with type "test" omitted
+
+# Unsupported target "signal_drop_signal" with type "test" omitted
+
+# Unsupported target "signal_multi_rt" with type "test" omitted
+
+# Unsupported target "signal_no_rt" with type "test" omitted
+
+# Unsupported target "signal_notify_both" with type "test" omitted
+
+# Unsupported target "signal_twice" with type "test" omitted
+
+# Unsupported target "signal_usr1" with type "test" omitted
+
+# Unsupported target "stream_chain" with type "test" omitted
+
+# Unsupported target "stream_collect" with type "test" omitted
+
+# Unsupported target "stream_empty" with type "test" omitted
+
+# Unsupported target "stream_fuse" with type "test" omitted
+
+# Unsupported target "stream_iter" with type "test" omitted
+
+# Unsupported target "stream_merge" with type "test" omitted
+
+# Unsupported target "stream_once" with type "test" omitted
+
+# Unsupported target "stream_pending" with type "test" omitted
+
+# Unsupported target "stream_reader" with type "test" omitted
+
+# Unsupported target "stream_stream_map" with type "test" omitted
+
+# Unsupported target "stream_timeout" with type "test" omitted
+
+# Unsupported target "sync_barrier" with type "test" omitted
+
+# Unsupported target "sync_broadcast" with type "test" omitted
+
+# Unsupported target "sync_cancellation_token" with type "test" omitted
+
+# Unsupported target "sync_errors" with type "test" omitted
+
+# Unsupported target "sync_mpsc" with type "test" omitted
+
+# Unsupported target "sync_mutex" with type "test" omitted
+
+# Unsupported target "sync_mutex_owned" with type "test" omitted
+
+# Unsupported target "sync_notify" with type "test" omitted
+
+# Unsupported target "sync_oneshot" with type "test" omitted
+
+# Unsupported target "sync_rwlock" with type "test" omitted
+
+# Unsupported target "sync_semaphore" with type "test" omitted
+
+# Unsupported target "sync_semaphore_owned" with type "test" omitted
+
+# Unsupported target "sync_watch" with type "test" omitted
+
+# Unsupported target "task_blocking" with type "test" omitted
+
+# Unsupported target "task_local" with type "test" omitted
+
+# Unsupported target "task_local_set" with type "test" omitted
+
+# Unsupported target "tcp_accept" with type "test" omitted
+
+# Unsupported target "tcp_connect" with type "test" omitted
+
+# Unsupported target "tcp_echo" with type "test" omitted
+
+# Unsupported target "tcp_into_split" with type "test" omitted
+
+# Unsupported target "tcp_peek" with type "test" omitted
+
+# Unsupported target "tcp_shutdown" with type "test" omitted
+
+# Unsupported target "tcp_split" with type "test" omitted
+
+# Unsupported target "test_clock" with type "test" omitted
+
+# Unsupported target "time_delay" with type "test" omitted
+
+# Unsupported target "time_delay_queue" with type "test" omitted
+
+# Unsupported target "time_interval" with type "test" omitted
+
+# Unsupported target "time_rt" with type "test" omitted
+
+# Unsupported target "time_throttle" with type "test" omitted
+
+# Unsupported target "time_timeout" with type "test" omitted
+
 # Unsupported target "udp" with type "test" omitted
+
 # Unsupported target "uds_cred" with type "test" omitted
+
 # Unsupported target "uds_datagram" with type "test" omitted
+
 # Unsupported target "uds_split" with type "test" omitted
+
 # Unsupported target "uds_stream" with type "test" omitted
diff --git a/cargo/remote/tokio-io-timeout-0.4.0.BUILD.bazel b/cargo/remote/BUILD.tokio-io-timeout-0.4.0.bazel
similarity index 95%
rename from cargo/remote/tokio-io-timeout-0.4.0.BUILD.bazel
rename to cargo/remote/BUILD.tokio-io-timeout-0.4.0.bazel
index ba895a9a4..4ff3e30da 100644
--- a/cargo/remote/tokio-io-timeout-0.4.0.BUILD.bazel
+++ b/cargo/remote/BUILD.tokio-io-timeout-0.4.0.bazel
@@ -28,27 +28,27 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "tokio_io_timeout",
-    crate_type = "lib",
-    deps = [
-        "@raze__bytes__0_5_6//:bytes",
-        "@raze__tokio__0_2_22//:tokio",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.4.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.4.0",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__bytes__0_5_6//:bytes",
+        "@raze__tokio__0_2_22//:tokio",
     ],
 )
diff --git a/cargo/remote/tokio-rustls-0.14.1.BUILD.bazel b/cargo/remote/BUILD.tokio-rustls-0.14.1.bazel
similarity index 92%
rename from cargo/remote/tokio-rustls-0.14.1.BUILD.bazel
rename to cargo/remote/BUILD.tokio-rustls-0.14.1.bazel
index ddad9cc3c..6660e8b47 100644
--- a/cargo/remote/tokio-rustls-0.14.1.BUILD.bazel
+++ b/cargo/remote/BUILD.tokio-rustls-0.14.1.bazel
@@ -28,32 +28,35 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# Unsupported target "badssl" with type "test" omitted
-# Unsupported target "early-data" with type "test" omitted
-# Unsupported target "test" with type "test" omitted
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "tokio_rustls",
-    crate_type = "lib",
-    deps = [
-        "@raze__futures_core__0_3_7//:futures_core",
-        "@raze__rustls__0_18_1//:rustls",
-        "@raze__tokio__0_2_22//:tokio",
-        "@raze__webpki__0_21_3//:webpki",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.14.1",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.14.1",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__futures_core__0_3_8//:futures_core",
+        "@raze__rustls__0_18_1//:rustls",
+        "@raze__tokio__0_2_22//:tokio",
+        "@raze__webpki__0_21_3//:webpki",
     ],
 )
+
+# Unsupported target "badssl" with type "test" omitted
+
+# Unsupported target "early-data" with type "test" omitted
+
+# Unsupported target "test" with type "test" omitted
diff --git a/cargo/remote/tokio-socks-0.3.0.BUILD.bazel b/cargo/remote/BUILD.tokio-socks-0.3.0.bazel
similarity index 90%
rename from cargo/remote/tokio-socks-0.3.0.BUILD.bazel
rename to cargo/remote/BUILD.tokio-socks-0.3.0.bazel
index 0342f918f..d44d3c52a 100644
--- a/cargo/remote/tokio-socks-0.3.0.BUILD.bazel
+++ b/cargo/remote/BUILD.tokio-socks-0.3.0.bazel
@@ -28,36 +28,42 @@ licenses([
     "notice",  # MIT from expression "MIT"
 ])
 
-# Generated targets
-# Unsupported target "common" with type "test" omitted
-# Unsupported target "long_username_password_auth" with type "test" omitted
-# Unsupported target "no_auth" with type "test" omitted
+# Generated Targets
+
 # Unsupported target "socket" with type "example" omitted
 
-# buildifier: leave-alone
+# Unsupported target "tor" with type "example" omitted
+
 rust_library(
     name = "tokio_socks",
-    crate_type = "lib",
-    deps = [
-        "@raze__bytes__0_4_12//:bytes",
-        "@raze__either__1_6_1//:either",
-        "@raze__futures__0_3_7//:futures",
-        "@raze__thiserror__1_0_21//:thiserror",
-        "@raze__tokio__0_2_22//:tokio",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.3.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.3.0",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__bytes__0_4_12//:bytes",
+        "@raze__either__1_6_1//:either",
+        "@raze__futures__0_3_8//:futures",
+        "@raze__thiserror__1_0_22//:thiserror",
+        "@raze__tokio__0_2_22//:tokio",
     ],
 )
-# Unsupported target "tor" with type "example" omitted
+
+# Unsupported target "common" with type "test" omitted
+
+# Unsupported target "long_username_password_auth" with type "test" omitted
+
+# Unsupported target "no_auth" with type "test" omitted
+
 # Unsupported target "username_auth" with type "test" omitted
diff --git a/cargo/remote/tokio-util-0.3.1.BUILD.bazel b/cargo/remote/BUILD.tokio-util-0.3.1.bazel
similarity index 90%
rename from cargo/remote/tokio-util-0.3.1.BUILD.bazel
rename to cargo/remote/BUILD.tokio-util-0.3.1.bazel
index e66ff679d..be0152c27 100644
--- a/cargo/remote/tokio-util-0.3.1.BUILD.bazel
+++ b/cargo/remote/BUILD.tokio-util-0.3.1.bazel
@@ -28,39 +28,45 @@ licenses([
     "notice",  # MIT from expression "MIT"
 ])
 
-# Generated targets
-# Unsupported target "codecs" with type "test" omitted
-# Unsupported target "framed" with type "test" omitted
-# Unsupported target "framed_read" with type "test" omitted
-# Unsupported target "framed_write" with type "test" omitted
-# Unsupported target "length_delimited" with type "test" omitted
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "tokio_util",
-    crate_type = "lib",
-    deps = [
-        "@raze__bytes__0_5_6//:bytes",
-        "@raze__futures_core__0_3_7//:futures_core",
-        "@raze__futures_sink__0_3_7//:futures_sink",
-        "@raze__log__0_4_11//:log",
-        "@raze__pin_project_lite__0_1_11//:pin_project_lite",
-        "@raze__tokio__0_2_22//:tokio",
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.3.1",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "codec",
         "default",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.3.1",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__bytes__0_5_6//:bytes",
+        "@raze__futures_core__0_3_8//:futures_core",
+        "@raze__futures_sink__0_3_8//:futures_sink",
+        "@raze__log__0_4_11//:log",
+        "@raze__pin_project_lite__0_1_11//:pin_project_lite",
+        "@raze__tokio__0_2_22//:tokio",
+    ],
 )
+
+# Unsupported target "codecs" with type "test" omitted
+
+# Unsupported target "framed" with type "test" omitted
+
+# Unsupported target "framed_read" with type "test" omitted
+
+# Unsupported target "framed_write" with type "test" omitted
+
+# Unsupported target "length_delimited" with type "test" omitted
+
 # Unsupported target "udp" with type "test" omitted
diff --git a/cargo/remote/toml-0.5.7.BUILD.bazel b/cargo/remote/BUILD.toml-0.5.7.bazel
similarity index 95%
rename from cargo/remote/toml-0.5.7.BUILD.bazel
rename to cargo/remote/BUILD.toml-0.5.7.bazel
index 537278c2e..fb4a1d8c5 100644
--- a/cargo/remote/toml-0.5.7.BUILD.bazel
+++ b/cargo/remote/BUILD.toml-0.5.7.bazel
@@ -28,31 +28,35 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# Unsupported target "decode" with type "example" omitted
-# Unsupported target "enum_external" with type "example" omitted
-# Unsupported target "enum_external_deserialize" with type "test" omitted
+# Generated Targets
+
+# Unsupported target "decode" with type "example" omitted
+
+# Unsupported target "enum_external" with type "example" omitted
+
+# Unsupported target "toml2json" with type "example" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "toml",
-    crate_type = "lib",
-    deps = [
-        "@raze__serde__1_0_117//:serde",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "default",
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.5.7",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
-        "default",
+    version = "0.5.7",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__serde__1_0_117//:serde",
     ],
 )
-# Unsupported target "toml2json" with type "example" omitted
+
+# Unsupported target "enum_external_deserialize" with type "test" omitted
diff --git a/cargo/remote/tower-service-0.3.0.BUILD.bazel b/cargo/remote/BUILD.tower-service-0.3.0.bazel
similarity index 95%
rename from cargo/remote/tower-service-0.3.0.BUILD.bazel
rename to cargo/remote/BUILD.tower-service-0.3.0.bazel
index a4bc6115d..916595885 100644
--- a/cargo/remote/tower-service-0.3.0.BUILD.bazel
+++ b/cargo/remote/BUILD.tower-service-0.3.0.bazel
@@ -28,25 +28,25 @@ licenses([
     "notice",  # MIT from expression "MIT"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "tower_service",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.3.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.3.0",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
diff --git a/cargo/remote/tracing-0.1.21.BUILD.bazel b/cargo/remote/BUILD.tracing-0.1.21.bazel
similarity index 97%
rename from cargo/remote/tracing-0.1.21.BUILD.bazel
rename to cargo/remote/BUILD.tracing-0.1.21.bazel
index c00334431..bee1c8986 100644
--- a/cargo/remote/tracing-0.1.21.BUILD.bazel
+++ b/cargo/remote/BUILD.tracing-0.1.21.bazel
@@ -28,44 +28,57 @@ licenses([
     "notice",  # MIT from expression "MIT"
 ])
 
-# Generated targets
-# Unsupported target "event" with type "test" omitted
-# Unsupported target "filter_caching_is_lexically_scoped" with type "test" omitted
-# Unsupported target "filters_are_not_reevaluated_for_the_same_span" with type "test" omitted
-# Unsupported target "filters_are_reevaluated_for_different_call_sites" with type "test" omitted
-# Unsupported target "filters_dont_leak" with type "test" omitted
-# Unsupported target "macro_imports" with type "test" omitted
-# Unsupported target "macros" with type "test" omitted
-# Unsupported target "max_level_hint" with type "test" omitted
-# Unsupported target "multiple_max_level_hints" with type "test" omitted
-# Unsupported target "no_subscriber" with type "bench" omitted
-# Unsupported target "span" with type "test" omitted
-# Unsupported target "subscriber" with type "bench" omitted
-# Unsupported target "subscriber" with type "test" omitted
+# Generated Targets
+
+# Unsupported target "no_subscriber" with type "bench" omitted
+
+# Unsupported target "subscriber" with type "bench" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "tracing",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "log",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.1.21",
+    # buildifier: leave-alone
     deps = [
         "@raze__cfg_if__0_1_10//:cfg_if",
         "@raze__log__0_4_11//:log",
         "@raze__pin_project_lite__0_1_11//:pin_project_lite",
         "@raze__tracing_core__0_1_17//:tracing_core",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.1.21",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-        "log",
-        "std",
-    ],
 )
+
+# Unsupported target "event" with type "test" omitted
+
+# Unsupported target "filter_caching_is_lexically_scoped" with type "test" omitted
+
+# Unsupported target "filters_are_not_reevaluated_for_the_same_span" with type "test" omitted
+
+# Unsupported target "filters_are_reevaluated_for_different_call_sites" with type "test" omitted
+
+# Unsupported target "filters_dont_leak" with type "test" omitted
+
+# Unsupported target "macro_imports" with type "test" omitted
+
+# Unsupported target "macros" with type "test" omitted
+
+# Unsupported target "max_level_hint" with type "test" omitted
+
+# Unsupported target "multiple_max_level_hints" with type "test" omitted
+
+# Unsupported target "span" with type "test" omitted
+
+# Unsupported target "subscriber" with type "test" omitted
diff --git a/cargo/remote/tracing-core-0.1.17.BUILD.bazel b/cargo/remote/BUILD.tracing-core-0.1.17.bazel
similarity index 95%
rename from cargo/remote/tracing-core-0.1.17.BUILD.bazel
rename to cargo/remote/BUILD.tracing-core-0.1.17.bazel
index 025408510..6651da1cc 100644
--- a/cargo/remote/tracing-core-0.1.17.BUILD.bazel
+++ b/cargo/remote/BUILD.tracing-core-0.1.17.bazel
@@ -28,31 +28,34 @@ licenses([
     "notice",  # MIT from expression "MIT"
 ])
 
-# Generated targets
-# Unsupported target "dispatch" with type "test" omitted
-# Unsupported target "global_dispatch" with type "test" omitted
-# Unsupported target "macros" with type "test" omitted
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "tracing_core",
-    crate_type = "lib",
-    deps = [
-        "@raze__lazy_static__1_4_0//:lazy_static",
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.1.17",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "lazy_static",
         "std",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.1.17",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__lazy_static__1_4_0//:lazy_static",
+    ],
 )
+
+# Unsupported target "dispatch" with type "test" omitted
+
+# Unsupported target "global_dispatch" with type "test" omitted
+
+# Unsupported target "macros" with type "test" omitted
diff --git a/cargo/remote/tracing-futures-0.2.4.BUILD.bazel b/cargo/remote/BUILD.tracing-futures-0.2.4.bazel
similarity index 95%
rename from cargo/remote/tracing-futures-0.2.4.BUILD.bazel
rename to cargo/remote/BUILD.tracing-futures-0.2.4.bazel
index b20641974..37cfc68d0 100644
--- a/cargo/remote/tracing-futures-0.2.4.BUILD.bazel
+++ b/cargo/remote/BUILD.tracing-futures-0.2.4.bazel
@@ -28,31 +28,33 @@ licenses([
     "notice",  # MIT from expression "MIT"
 ])
 
-# Generated targets
-# Unsupported target "std_future" with type "test" omitted
-# Unsupported target "support" with type "test" omitted
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "tracing_futures",
-    crate_type = "lib",
-    deps = [
-        "@raze__pin_project__0_4_27//:pin_project",
-        "@raze__tracing__0_1_21//:tracing",
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.2.4",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "pin-project",
         "std-future",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.2.4",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__pin_project__0_4_27//:pin_project",
+        "@raze__tracing__0_1_21//:tracing",
+    ],
 )
+
+# Unsupported target "std_future" with type "test" omitted
+
+# Unsupported target "support" with type "test" omitted
diff --git a/cargo/remote/try-lock-0.2.3.BUILD.bazel b/cargo/remote/BUILD.try-lock-0.2.3.bazel
similarity index 95%
rename from cargo/remote/try-lock-0.2.3.BUILD.bazel
rename to cargo/remote/BUILD.try-lock-0.2.3.bazel
index 694a76017..b24774179 100644
--- a/cargo/remote/try-lock-0.2.3.BUILD.bazel
+++ b/cargo/remote/BUILD.try-lock-0.2.3.bazel
@@ -28,25 +28,25 @@ licenses([
     "notice",  # MIT from expression "MIT"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "try_lock",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.2.3",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.2.3",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
diff --git a/cargo/remote/type-map-0.3.0.BUILD.bazel b/cargo/remote/BUILD.type-map-0.3.0.bazel
similarity index 95%
rename from cargo/remote/type-map-0.3.0.BUILD.bazel
rename to cargo/remote/BUILD.type-map-0.3.0.bazel
index 3be61cb00..c64d35a1f 100644
--- a/cargo/remote/type-map-0.3.0.BUILD.bazel
+++ b/cargo/remote/BUILD.type-map-0.3.0.bazel
@@ -28,26 +28,26 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "type_map",
-    crate_type = "lib",
-    deps = [
-        "@raze__fxhash__0_2_1//:fxhash",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.3.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.3.0",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__fxhash__0_2_1//:fxhash",
     ],
 )
diff --git a/cargo/remote/typenum-1.12.0.BUILD.bazel b/cargo/remote/BUILD.typenum-1.12.0.bazel
similarity index 93%
rename from cargo/remote/typenum-1.12.0.BUILD.bazel
rename to cargo/remote/BUILD.typenum-1.12.0.bazel
index aaf658a79..acbe7a703 100644
--- a/cargo/remote/typenum-1.12.0.BUILD.bazel
+++ b/cargo/remote/BUILD.typenum-1.12.0.bazel
@@ -28,57 +28,55 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "typenum_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build/main.rs",
-    edition = "2015",
-    deps = [
+    build_script_env = {
+    },
+    crate_features = [
     ],
+    crate_root = "build/main.rs",
+    data = glob(["**"]),
+    edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    crate_features = [
-    ],
-    build_script_env = {
-    },
-    data = glob(["**"]),
     tags = [
         "cargo-raze",
         "manual",
     ],
     version = "1.12.0",
     visibility = ["//visibility:private"],
+    deps = [
+    ],
 )
 
-# Unsupported target "test" with type "test" omitted
-
-# buildifier: leave-alone
 rust_library(
     name = "typenum",
-    crate_type = "lib",
-    deps = [
-        ":typenum_build_script",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "1.12.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "1.12.0",
+    # buildifier: leave-alone
+    deps = [
+        ":typenum_build_script",
     ],
 )
+
+# Unsupported target "test" with type "test" omitted
diff --git a/cargo/remote/unic-langid-0.9.0.BUILD.bazel b/cargo/remote/BUILD.unic-langid-0.9.0.bazel
similarity index 95%
rename from cargo/remote/unic-langid-0.9.0.BUILD.bazel
rename to cargo/remote/BUILD.unic-langid-0.9.0.bazel
index 5b3b2de83..31eec22b1 100644
--- a/cargo/remote/unic-langid-0.9.0.BUILD.bazel
+++ b/cargo/remote/BUILD.unic-langid-0.9.0.bazel
@@ -28,30 +28,30 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "unic_langid",
-    crate_type = "lib",
-    deps = [
-        "@raze__unic_langid_impl__0_9_0//:unic_langid_impl",
-        "@raze__unic_langid_macros__0_9_0//:unic_langid_macros",
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.9.0",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "default",
         "macros",
         "unic-langid-macros",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.9.0",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__unic_langid_impl__0_9_0//:unic_langid_impl",
+        "@raze__unic_langid_macros__0_9_0//:unic_langid_macros",
+    ],
 )
diff --git a/cargo/remote/unic-langid-impl-0.9.0.BUILD.bazel b/cargo/remote/BUILD.unic-langid-impl-0.9.0.bazel
similarity index 95%
rename from cargo/remote/unic-langid-impl-0.9.0.BUILD.bazel
rename to cargo/remote/BUILD.unic-langid-impl-0.9.0.bazel
index 1466bbe69..c1b01fd6a 100644
--- a/cargo/remote/unic-langid-impl-0.9.0.BUILD.bazel
+++ b/cargo/remote/BUILD.unic-langid-impl-0.9.0.bazel
@@ -28,81 +28,86 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "canonicalize" with type "bench" omitted
 
-# buildifier: leave-alone
+# Unsupported target "langid" with type "bench" omitted
+
+# Unsupported target "likely_subtags" with type "bench" omitted
+
+# Unsupported target "parser" with type "bench" omitted
+
 rust_binary(
     # Prefix bin name to disambiguate from (probable) collision with lib name
     # N.B.: The exact form of this is subject to change.
     name = "cargo_bin_generate_layout",
-    deps = [
-        # Binaries get an implicit dependency on their crate's lib
-        ":unic_langid_impl",
-        "@raze__tinystr__0_3_4//:tinystr",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/bin/generate_layout.rs",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.9.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
-    ],
-)
-
-# buildifier: leave-alone
-rust_binary(
-    # Prefix bin name to disambiguate from (probable) collision with lib name
-    # N.B.: The exact form of this is subject to change.
-    name = "cargo_bin_generate_likelysubtags",
+    version = "0.9.0",
+    # buildifier: leave-alone
     deps = [
         # Binaries get an implicit dependency on their crate's lib
         ":unic_langid_impl",
         "@raze__tinystr__0_3_4//:tinystr",
     ],
+)
+
+rust_binary(
+    # Prefix bin name to disambiguate from (probable) collision with lib name
+    # N.B.: The exact form of this is subject to change.
+    name = "cargo_bin_generate_likelysubtags",
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/bin/generate_likelysubtags.rs",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.9.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
-    ],
-)
-# Unsupported target "langid" with type "bench" omitted
-# Unsupported target "likely_subtags" with type "bench" omitted
-# Unsupported target "likelysubtags" with type "test" omitted
-# Unsupported target "parser" with type "bench" omitted
-
-# buildifier: leave-alone
-rust_library(
-    name = "unic_langid_impl",
-    crate_type = "lib",
+    version = "0.9.0",
+    # buildifier: leave-alone
     deps = [
+        # Binaries get an implicit dependency on their crate's lib
+        ":unic_langid_impl",
         "@raze__tinystr__0_3_4//:tinystr",
     ],
+)
+
+rust_library(
+    name = "unic_langid_impl",
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.9.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.9.0",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__tinystr__0_3_4//:tinystr",
     ],
 )
+
+# Unsupported target "likelysubtags" with type "test" omitted
diff --git a/cargo/remote/unic-langid-macros-0.9.0.BUILD.bazel b/cargo/remote/BUILD.unic-langid-macros-0.9.0.bazel
similarity index 96%
rename from cargo/remote/unic-langid-macros-0.9.0.BUILD.bazel
rename to cargo/remote/BUILD.unic-langid-macros-0.9.0.bazel
index d1c3e9aa8..e38a1f61e 100644
--- a/cargo/remote/unic-langid-macros-0.9.0.BUILD.bazel
+++ b/cargo/remote/BUILD.unic-langid-macros-0.9.0.bazel
@@ -28,18 +28,15 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "unic_langid_macros",
-    crate_type = "lib",
-    deps = [
-        "@raze__tinystr__0_3_4//:tinystr",
-        "@raze__unic_langid_impl__0_9_0//:unic_langid_impl",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     proc_macro_deps = [
         "@raze__proc_macro_hack__0_5_19//:proc_macro_hack",
@@ -48,11 +45,14 @@ rust_library(
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.9.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.9.0",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__tinystr__0_3_4//:tinystr",
+        "@raze__unic_langid_impl__0_9_0//:unic_langid_impl",
     ],
 )
diff --git a/cargo/remote/unic-langid-macros-impl-0.9.0.BUILD.bazel b/cargo/remote/BUILD.unic-langid-macros-impl-0.9.0.bazel
similarity index 96%
rename from cargo/remote/unic-langid-macros-impl-0.9.0.BUILD.bazel
rename to cargo/remote/BUILD.unic-langid-macros-impl-0.9.0.bazel
index 6755d6cb1..ddd20f70d 100644
--- a/cargo/remote/unic-langid-macros-impl-0.9.0.BUILD.bazel
+++ b/cargo/remote/BUILD.unic-langid-macros-impl-0.9.0.bazel
@@ -28,19 +28,15 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "unic_langid_macros_impl",
-    crate_type = "proc-macro",
-    deps = [
-        "@raze__quote__1_0_7//:quote",
-        "@raze__syn__1_0_48//:syn",
-        "@raze__unic_langid_impl__0_9_0//:unic_langid_impl",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "proc-macro",
     edition = "2018",
     proc_macro_deps = [
         "@raze__proc_macro_hack__0_5_19//:proc_macro_hack",
@@ -48,11 +44,15 @@ rust_library(
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.9.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.9.0",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__quote__1_0_7//:quote",
+        "@raze__syn__1_0_48//:syn",
+        "@raze__unic_langid_impl__0_9_0//:unic_langid_impl",
     ],
 )
diff --git a/cargo/remote/unicase-2.6.0.BUILD.bazel b/cargo/remote/BUILD.unicase-2.6.0.bazel
similarity index 93%
rename from cargo/remote/unicase-2.6.0.BUILD.bazel
rename to cargo/remote/BUILD.unicase-2.6.0.bazel
index 8a2f38ce9..41f6fd2f2 100644
--- a/cargo/remote/unicase-2.6.0.BUILD.bazel
+++ b/cargo/remote/BUILD.unicase-2.6.0.bazel
@@ -28,57 +28,54 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "unicase_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build.rs",
-    edition = "2015",
-    deps = [
-        "@raze__version_check__0_9_2//:version_check",
+    build_script_env = {
+    },
+    crate_features = [
     ],
+    crate_root = "build.rs",
+    data = glob(["**"]),
+    edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    crate_features = [
-    ],
-    build_script_env = {
-    },
-    data = glob(["**"]),
     tags = [
         "cargo-raze",
         "manual",
     ],
     version = "2.6.0",
     visibility = ["//visibility:private"],
+    deps = [
+        "@raze__version_check__0_9_2//:version_check",
+    ],
 )
 
-
-# buildifier: leave-alone
 rust_library(
     name = "unicase",
-    crate_type = "lib",
-    deps = [
-        ":unicase_build_script",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "2.6.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "2.6.0",
+    # buildifier: leave-alone
+    deps = [
+        ":unicase_build_script",
     ],
 )
diff --git a/cargo/remote/unicode-bidi-0.3.4.BUILD.bazel b/cargo/remote/BUILD.unicode-bidi-0.3.4.bazel
similarity index 95%
rename from cargo/remote/unicode-bidi-0.3.4.BUILD.bazel
rename to cargo/remote/BUILD.unicode-bidi-0.3.4.bazel
index 79c26cd90..6db4024a9 100644
--- a/cargo/remote/unicode-bidi-0.3.4.BUILD.bazel
+++ b/cargo/remote/BUILD.unicode-bidi-0.3.4.bazel
@@ -28,27 +28,27 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "unicode_bidi",
-    crate_type = "lib",
-    deps = [
-        "@raze__matches__0_1_8//:matches",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "default",
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.3.4",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
-        "default",
+    version = "0.3.4",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__matches__0_1_8//:matches",
     ],
 )
diff --git a/cargo/remote/unicode-normalization-0.1.13.BUILD.bazel b/cargo/remote/BUILD.unicode-normalization-0.1.13.bazel
similarity index 95%
rename from cargo/remote/unicode-normalization-0.1.13.BUILD.bazel
rename to cargo/remote/BUILD.unicode-normalization-0.1.13.bazel
index 642bbf9c8..fff82dbdf 100644
--- a/cargo/remote/unicode-normalization-0.1.13.BUILD.bazel
+++ b/cargo/remote/BUILD.unicode-normalization-0.1.13.bazel
@@ -28,29 +28,30 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "bench" with type "bench" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "unicode_normalization",
-    crate_type = "lib",
-    deps = [
-        "@raze__tinyvec__0_3_4//:tinyvec",
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.1.13",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "default",
         "std",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.1.13",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__tinyvec__0_3_4//:tinyvec",
+    ],
 )
diff --git a/cargo/remote/unicode-segmentation-1.6.0.BUILD.bazel b/cargo/remote/BUILD.unicode-segmentation-1.6.0.bazel
similarity index 95%
rename from cargo/remote/unicode-segmentation-1.6.0.BUILD.bazel
rename to cargo/remote/BUILD.unicode-segmentation-1.6.0.bazel
index 4d17619fd..d0519cb34 100644
--- a/cargo/remote/unicode-segmentation-1.6.0.BUILD.bazel
+++ b/cargo/remote/BUILD.unicode-segmentation-1.6.0.bazel
@@ -28,25 +28,25 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "unicode_segmentation",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "1.6.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "1.6.0",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
diff --git a/cargo/remote/unicode-xid-0.2.1.BUILD.bazel b/cargo/remote/BUILD.unicode-xid-0.2.1.bazel
similarity index 95%
rename from cargo/remote/unicode-xid-0.2.1.BUILD.bazel
rename to cargo/remote/BUILD.unicode-xid-0.2.1.bazel
index 8bea35669..8933e691b 100644
--- a/cargo/remote/unicode-xid-0.2.1.BUILD.bazel
+++ b/cargo/remote/BUILD.unicode-xid-0.2.1.bazel
@@ -28,27 +28,28 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# Unsupported target "exhaustive_tests" with type "test" omitted
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "unicode_xid",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "default",
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.2.1",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
-        "default",
+    version = "0.2.1",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
+
+# Unsupported target "exhaustive_tests" with type "test" omitted
diff --git a/cargo/remote/unindent-0.1.7.BUILD.bazel b/cargo/remote/BUILD.unindent-0.1.7.bazel
similarity index 95%
rename from cargo/remote/unindent-0.1.7.BUILD.bazel
rename to cargo/remote/BUILD.unindent-0.1.7.bazel
index cce89968c..5f141768e 100644
--- a/cargo/remote/unindent-0.1.7.BUILD.bazel
+++ b/cargo/remote/BUILD.unindent-0.1.7.bazel
@@ -28,25 +28,25 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "unindent",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.1.7",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.1.7",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
diff --git a/cargo/remote/untrusted-0.7.1.BUILD.bazel b/cargo/remote/BUILD.untrusted-0.7.1.bazel
similarity index 95%
rename from cargo/remote/untrusted-0.7.1.BUILD.bazel
rename to cargo/remote/BUILD.untrusted-0.7.1.bazel
index 7701ab910..bb369b4fa 100644
--- a/cargo/remote/untrusted-0.7.1.BUILD.bazel
+++ b/cargo/remote/BUILD.untrusted-0.7.1.bazel
@@ -28,26 +28,27 @@ licenses([
     "notice",  # ISC from expression "ISC"
 ])
 
-# Generated targets
-# Unsupported target "tests" with type "test" omitted
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "untrusted",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/untrusted.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.7.1",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.7.1",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
+
+# Unsupported target "tests" with type "test" omitted
diff --git a/cargo/remote/url-2.1.1.BUILD.bazel b/cargo/remote/BUILD.url-2.2.0.bazel
similarity index 84%
rename from cargo/remote/url-2.1.1.BUILD.bazel
rename to cargo/remote/BUILD.url-2.2.0.bazel
index bad16daa4..77a906889 100644
--- a/cargo/remote/url-2.1.1.BUILD.bazel
+++ b/cargo/remote/BUILD.url-2.2.0.bazel
@@ -28,31 +28,31 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# Unsupported target "data" with type "test" omitted
-# Unsupported target "parse_url" with type "bench" omitted
-# Unsupported target "unit" with type "test" omitted
+# Generated Targets
+
+# Unsupported target "parse_url" with type "bench" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "url",
-    crate_type = "lib",
-    deps = [
-        "@raze__idna__0_2_0//:idna",
-        "@raze__matches__0_1_8//:matches",
-        "@raze__percent_encoding__2_1_0//:percent_encoding",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
-    edition = "2015",
+    crate_type = "lib",
+    edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "2.1.1",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "2.2.0",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__form_urlencoded__1_0_0//:form_urlencoded",
+        "@raze__idna__0_2_0//:idna",
+        "@raze__matches__0_1_8//:matches",
+        "@raze__percent_encoding__2_1_0//:percent_encoding",
     ],
 )
diff --git a/cargo/remote/utime-0.3.1.BUILD.bazel b/cargo/remote/BUILD.utime-0.3.1.bazel
similarity index 97%
rename from cargo/remote/utime-0.3.1.BUILD.bazel
rename to cargo/remote/BUILD.utime-0.3.1.bazel
index a5f28a329..47e3740b5 100644
--- a/cargo/remote/utime-0.3.1.BUILD.bazel
+++ b/cargo/remote/BUILD.utime-0.3.1.bazel
@@ -28,12 +28,27 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0 OR MIT"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "utime",
+    srcs = glob(["**/*.rs"]),
+    aliases = {
+    },
+    crate_features = [
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.3.1",
+    # buildifier: leave-alone
     deps = [
     ] + selects.with_or({
         # cfg(unix)
@@ -58,20 +73,6 @@ rust_library(
         ],
         "//conditions:default": [],
     }),
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.3.1",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-    ],
-    aliases = {
-    },
 )
+
 # Unsupported target "utime" with type "test" omitted
diff --git a/cargo/remote/vcpkg-0.2.10.BUILD.bazel b/cargo/remote/BUILD.vcpkg-0.2.10.bazel
similarity index 95%
rename from cargo/remote/vcpkg-0.2.10.BUILD.bazel
rename to cargo/remote/BUILD.vcpkg-0.2.10.bazel
index d7d62d035..82be97634 100644
--- a/cargo/remote/vcpkg-0.2.10.BUILD.bazel
+++ b/cargo/remote/BUILD.vcpkg-0.2.10.bazel
@@ -28,25 +28,25 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "vcpkg",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.2.10",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.2.10",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
diff --git a/cargo/remote/version_check-0.9.2.BUILD.bazel b/cargo/remote/BUILD.version_check-0.9.2.bazel
similarity index 95%
rename from cargo/remote/version_check-0.9.2.BUILD.bazel
rename to cargo/remote/BUILD.version_check-0.9.2.bazel
index fef24a659..469edc03b 100644
--- a/cargo/remote/version_check-0.9.2.BUILD.bazel
+++ b/cargo/remote/BUILD.version_check-0.9.2.bazel
@@ -28,25 +28,25 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "version_check",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.9.2",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.9.2",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
diff --git a/cargo/remote/want-0.3.0.BUILD.bazel b/cargo/remote/BUILD.want-0.3.0.bazel
similarity index 95%
rename from cargo/remote/want-0.3.0.BUILD.bazel
rename to cargo/remote/BUILD.want-0.3.0.bazel
index 9214b5ea2..abba65751 100644
--- a/cargo/remote/want-0.3.0.BUILD.bazel
+++ b/cargo/remote/BUILD.want-0.3.0.bazel
@@ -28,28 +28,29 @@ licenses([
     "notice",  # MIT from expression "MIT"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "throughput" with type "bench" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "want",
-    crate_type = "lib",
-    deps = [
-        "@raze__log__0_4_11//:log",
-        "@raze__try_lock__0_2_3//:try_lock",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.3.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.3.0",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__log__0_4_11//:log",
+        "@raze__try_lock__0_2_3//:try_lock",
     ],
 )
diff --git a/cargo/remote/wasi-0.10.0+wasi-snapshot-preview1.BUILD.bazel b/cargo/remote/BUILD.wasi-0.10.0+wasi-snapshot-preview1.bazel
similarity index 95%
rename from cargo/remote/wasi-0.10.0+wasi-snapshot-preview1.BUILD.bazel
rename to cargo/remote/BUILD.wasi-0.10.0+wasi-snapshot-preview1.bazel
index 384524e2f..a4034f361 100644
--- a/cargo/remote/wasi-0.10.0+wasi-snapshot-preview1.BUILD.bazel
+++ b/cargo/remote/BUILD.wasi-0.10.0+wasi-snapshot-preview1.bazel
@@ -28,27 +28,27 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0 OR (Apache-2.0 OR MIT)"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "wasi",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.10.0+wasi-snapshot-preview1",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "default",
         "std",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.10.0+wasi-snapshot-preview1",
+    # buildifier: leave-alone
+    deps = [
+    ],
 )
diff --git a/cargo/remote/wasi-0.9.0+wasi-snapshot-preview1.BUILD.bazel b/cargo/remote/BUILD.wasi-0.9.0+wasi-snapshot-preview1.bazel
similarity index 95%
rename from cargo/remote/wasi-0.9.0+wasi-snapshot-preview1.BUILD.bazel
rename to cargo/remote/BUILD.wasi-0.9.0+wasi-snapshot-preview1.bazel
index baa3e62c1..4e3a84caa 100644
--- a/cargo/remote/wasi-0.9.0+wasi-snapshot-preview1.BUILD.bazel
+++ b/cargo/remote/BUILD.wasi-0.9.0+wasi-snapshot-preview1.bazel
@@ -28,27 +28,27 @@ licenses([
     "notice",  # Apache-2.0 from expression "Apache-2.0 OR (Apache-2.0 OR MIT)"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "wasi",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.9.0+wasi-snapshot-preview1",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "default",
         "std",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.9.0+wasi-snapshot-preview1",
+    # buildifier: leave-alone
+    deps = [
+    ],
 )
diff --git a/cargo/remote/wasm-bindgen-0.2.68.BUILD.bazel b/cargo/remote/BUILD.wasm-bindgen-0.2.68.bazel
similarity index 91%
rename from cargo/remote/wasm-bindgen-0.2.68.BUILD.bazel
rename to cargo/remote/BUILD.wasm-bindgen-0.2.68.bazel
index bb839e5f7..c8e4200ae 100644
--- a/cargo/remote/wasm-bindgen-0.2.68.BUILD.bazel
+++ b/cargo/remote/BUILD.wasm-bindgen-0.2.68.bazel
@@ -28,74 +28,17 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "wasm_bindgen_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build.rs",
-    edition = "2018",
-    deps = [
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    crate_features = [
-      "default",
-      "serde",
-      "serde-serialize",
-      "serde_json",
-      "spans",
-      "std",
-    ],
     build_script_env = {
     },
-    data = glob(["**"]),
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    version = "0.2.68",
-    visibility = ["//visibility:private"],
-)
-
-# Unsupported target "headless" with type "test" omitted
-# Unsupported target "must_use" with type "test" omitted
-# Unsupported target "non_wasm" with type "test" omitted
-# Unsupported target "std-crate-no-std-dep" with type "test" omitted
-# Unsupported target "unwrap_throw" with type "test" omitted
-# Unsupported target "wasm" with type "test" omitted
-
-# buildifier: leave-alone
-rust_library(
-    name = "wasm_bindgen",
-    crate_type = "lib",
-    deps = [
-        ":wasm_bindgen_build_script",
-        "@raze__cfg_if__0_1_10//:cfg_if",
-        "@raze__serde__1_0_117//:serde",
-        "@raze__serde_json__1_0_59//:serde_json",
-    ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    proc_macro_deps = [
-        "@raze__wasm_bindgen_macro__0_2_68//:wasm_bindgen_macro",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.2.68",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "default",
         "serde",
@@ -104,4 +47,64 @@ rust_library(
         "spans",
         "std",
     ],
+    crate_root = "build.rs",
+    data = glob(["**"]),
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.2.68",
+    visibility = ["//visibility:private"],
+    deps = [
+    ],
 )
+
+rust_library(
+    name = "wasm_bindgen",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "default",
+        "serde",
+        "serde-serialize",
+        "serde_json",
+        "spans",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2018",
+    proc_macro_deps = [
+        "@raze__wasm_bindgen_macro__0_2_68//:wasm_bindgen_macro",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.2.68",
+    # buildifier: leave-alone
+    deps = [
+        ":wasm_bindgen_build_script",
+        "@raze__cfg_if__0_1_10//:cfg_if",
+        "@raze__serde__1_0_117//:serde",
+        "@raze__serde_json__1_0_59//:serde_json",
+    ],
+)
+
+# Unsupported target "headless" with type "test" omitted
+
+# Unsupported target "must_use" with type "test" omitted
+
+# Unsupported target "non_wasm" with type "test" omitted
+
+# Unsupported target "std-crate-no-std-dep" with type "test" omitted
+
+# Unsupported target "unwrap_throw" with type "test" omitted
+
+# Unsupported target "wasm" with type "test" omitted
diff --git a/cargo/remote/wasm-bindgen-backend-0.2.68.BUILD.bazel b/cargo/remote/BUILD.wasm-bindgen-backend-0.2.68.bazel
similarity index 96%
rename from cargo/remote/wasm-bindgen-backend-0.2.68.BUILD.bazel
rename to cargo/remote/BUILD.wasm-bindgen-backend-0.2.68.bazel
index 27fee3b9f..519ff7687 100644
--- a/cargo/remote/wasm-bindgen-backend-0.2.68.BUILD.bazel
+++ b/cargo/remote/BUILD.wasm-bindgen-backend-0.2.68.bazel
@@ -28,12 +28,26 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "wasm_bindgen_backend",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "spans",
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.2.68",
+    # buildifier: leave-alone
     deps = [
         "@raze__bumpalo__3_4_0//:bumpalo",
         "@raze__lazy_static__1_4_0//:lazy_static",
@@ -43,18 +57,4 @@ rust_library(
         "@raze__syn__1_0_48//:syn",
         "@raze__wasm_bindgen_shared__0_2_68//:wasm_bindgen_shared",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.2.68",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-        "spans",
-    ],
 )
diff --git a/cargo/remote/wasm-bindgen-futures-0.4.18.BUILD.bazel b/cargo/remote/BUILD.wasm-bindgen-futures-0.4.18.bazel
similarity index 95%
rename from cargo/remote/wasm-bindgen-futures-0.4.18.BUILD.bazel
rename to cargo/remote/BUILD.wasm-bindgen-futures-0.4.18.bazel
index 78a140824..98a757ab9 100644
--- a/cargo/remote/wasm-bindgen-futures-0.4.18.BUILD.bazel
+++ b/cargo/remote/BUILD.wasm-bindgen-futures-0.4.18.bazel
@@ -28,29 +28,30 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# Unsupported target "tests" with type "test" omitted
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "wasm_bindgen_futures",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.4.18",
+    # buildifier: leave-alone
     deps = [
         "@raze__cfg_if__0_1_10//:cfg_if",
         "@raze__js_sys__0_3_45//:js_sys",
         "@raze__wasm_bindgen__0_2_68//:wasm_bindgen",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.4.18",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-    ],
 )
+
+# Unsupported target "tests" with type "test" omitted
diff --git a/cargo/remote/wasm-bindgen-macro-0.2.68.BUILD.bazel b/cargo/remote/BUILD.wasm-bindgen-macro-0.2.68.bazel
similarity index 95%
rename from cargo/remote/wasm-bindgen-macro-0.2.68.BUILD.bazel
rename to cargo/remote/BUILD.wasm-bindgen-macro-0.2.68.bazel
index 5aa0ae9aa..b801a81c9 100644
--- a/cargo/remote/wasm-bindgen-macro-0.2.68.BUILD.bazel
+++ b/cargo/remote/BUILD.wasm-bindgen-macro-0.2.68.bazel
@@ -28,29 +28,30 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# Unsupported target "ui" with type "test" omitted
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "wasm_bindgen_macro",
-    crate_type = "proc-macro",
-    deps = [
-        "@raze__quote__1_0_7//:quote",
-        "@raze__wasm_bindgen_macro_support__0_2_68//:wasm_bindgen_macro_support",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "spans",
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "proc-macro",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.2.68",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
-        "spans",
+    version = "0.2.68",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__quote__1_0_7//:quote",
+        "@raze__wasm_bindgen_macro_support__0_2_68//:wasm_bindgen_macro_support",
     ],
 )
+
+# Unsupported target "ui" with type "test" omitted
diff --git a/cargo/remote/wasm-bindgen-macro-support-0.2.68.BUILD.bazel b/cargo/remote/BUILD.wasm-bindgen-macro-support-0.2.68.bazel
similarity index 96%
rename from cargo/remote/wasm-bindgen-macro-support-0.2.68.BUILD.bazel
rename to cargo/remote/BUILD.wasm-bindgen-macro-support-0.2.68.bazel
index ff761a0ba..d06d78100 100644
--- a/cargo/remote/wasm-bindgen-macro-support-0.2.68.BUILD.bazel
+++ b/cargo/remote/BUILD.wasm-bindgen-macro-support-0.2.68.bazel
@@ -28,12 +28,26 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "wasm_bindgen_macro_support",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "spans",
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.2.68",
+    # buildifier: leave-alone
     deps = [
         "@raze__proc_macro2__1_0_24//:proc_macro2",
         "@raze__quote__1_0_7//:quote",
@@ -41,18 +55,4 @@ rust_library(
         "@raze__wasm_bindgen_backend__0_2_68//:wasm_bindgen_backend",
         "@raze__wasm_bindgen_shared__0_2_68//:wasm_bindgen_shared",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.2.68",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-        "spans",
-    ],
 )
diff --git a/cargo/remote/wasm-bindgen-shared-0.2.68.BUILD.bazel b/cargo/remote/BUILD.wasm-bindgen-shared-0.2.68.bazel
similarity index 93%
rename from cargo/remote/wasm-bindgen-shared-0.2.68.BUILD.bazel
rename to cargo/remote/BUILD.wasm-bindgen-shared-0.2.68.bazel
index 91e39f8ca..e694ea5d9 100644
--- a/cargo/remote/wasm-bindgen-shared-0.2.68.BUILD.bazel
+++ b/cargo/remote/BUILD.wasm-bindgen-shared-0.2.68.bazel
@@ -28,56 +28,53 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "wasm_bindgen_shared_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build.rs",
-    edition = "2018",
-    deps = [
+    build_script_env = {
+    },
+    crate_features = [
     ],
+    crate_root = "build.rs",
+    data = glob(["**"]),
+    edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    crate_features = [
-    ],
-    build_script_env = {
-    },
-    data = glob(["**"]),
     tags = [
         "cargo-raze",
         "manual",
     ],
     version = "0.2.68",
     visibility = ["//visibility:private"],
+    deps = [
+    ],
 )
 
-
-# buildifier: leave-alone
 rust_library(
     name = "wasm_bindgen_shared",
-    crate_type = "lib",
-    deps = [
-        ":wasm_bindgen_shared_build_script",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2018",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.2.68",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.2.68",
+    # buildifier: leave-alone
+    deps = [
+        ":wasm_bindgen_shared_build_script",
     ],
 )
diff --git a/cargo/remote/web-sys-0.3.45.BUILD.bazel b/cargo/remote/BUILD.web-sys-0.3.45.bazel
similarity index 96%
rename from cargo/remote/web-sys-0.3.45.BUILD.bazel
rename to cargo/remote/BUILD.web-sys-0.3.45.bazel
index 4ea2f9743..332e877fb 100644
--- a/cargo/remote/web-sys-0.3.45.BUILD.bazel
+++ b/cargo/remote/BUILD.web-sys-0.3.45.bazel
@@ -28,28 +28,11 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# Unsupported target "wasm" with type "test" omitted
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "web_sys",
-    crate_type = "lib",
-    deps = [
-        "@raze__js_sys__0_3_45//:js_sys",
-        "@raze__wasm_bindgen__0_2_68//:wasm_bindgen",
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.3.45",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "Blob",
         "BlobPropertyBag",
@@ -66,4 +49,22 @@ rust_library(
         "Window",
         "Worker",
     ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.3.45",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__js_sys__0_3_45//:js_sys",
+        "@raze__wasm_bindgen__0_2_68//:wasm_bindgen",
+    ],
 )
+
+# Unsupported target "wasm" with type "test" omitted
diff --git a/cargo/remote/webpki-0.21.3.BUILD.bazel b/cargo/remote/BUILD.webpki-0.21.3.bazel
similarity index 95%
rename from cargo/remote/webpki-0.21.3.BUILD.bazel
rename to cargo/remote/BUILD.webpki-0.21.3.bazel
index 61bc0d2b6..15fabf09e 100644
--- a/cargo/remote/webpki-0.21.3.BUILD.bazel
+++ b/cargo/remote/BUILD.webpki-0.21.3.bazel
@@ -28,33 +28,35 @@ licenses([
     "restricted",  # no license
 ])
 
-# Generated targets
-# Unsupported target "dns_name_tests" with type "test" omitted
-# Unsupported target "integration" with type "test" omitted
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "webpki",
-    crate_type = "lib",
-    deps = [
-        "@raze__ring__0_16_15//:ring",
-        "@raze__untrusted__0_7_1//:untrusted",
-    ],
     srcs = glob(["**/*.rs"]),
-    crate_root = "src/webpki.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    data = glob(["src/**"]),
-    version = "0.21.3",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "default",
         "std",
         "trust_anchor_util",
     ],
+    crate_root = "src/webpki.rs",
+    crate_type = "lib",
+    data = glob(["src/**"]),
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.21.3",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__ring__0_16_15//:ring",
+        "@raze__untrusted__0_7_1//:untrusted",
+    ],
 )
+
+# Unsupported target "dns_name_tests" with type "test" omitted
+
+# Unsupported target "integration" with type "test" omitted
diff --git a/cargo/remote/which-4.0.2.BUILD.bazel b/cargo/remote/BUILD.which-4.0.2.bazel
similarity index 91%
rename from cargo/remote/which-4.0.2.BUILD.bazel
rename to cargo/remote/BUILD.which-4.0.2.bazel
index 9d52c5d5d..2c2fc69ed 100644
--- a/cargo/remote/which-4.0.2.BUILD.bazel
+++ b/cargo/remote/BUILD.which-4.0.2.bazel
@@ -28,28 +28,29 @@ licenses([
     "notice",  # MIT from expression "MIT"
 ])
 
-# Generated targets
-# Unsupported target "basic" with type "test" omitted
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "which",
-    crate_type = "lib",
-    deps = [
-        "@raze__libc__0_2_80//:libc",
-        "@raze__thiserror__1_0_21//:thiserror",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "4.0.2",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "4.0.2",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__libc__0_2_80//:libc",
+        "@raze__thiserror__1_0_22//:thiserror",
     ],
 )
+
+# Unsupported target "basic" with type "test" omitted
diff --git a/cargo/remote/winapi-0.2.8.BUILD.bazel b/cargo/remote/BUILD.winapi-0.2.8.bazel
similarity index 94%
rename from cargo/remote/winapi-0.2.8.BUILD.bazel
rename to cargo/remote/BUILD.winapi-0.2.8.bazel
index 6566787be..40eae9480 100644
--- a/cargo/remote/winapi-0.2.8.BUILD.bazel
+++ b/cargo/remote/BUILD.winapi-0.2.8.bazel
@@ -28,25 +28,25 @@ licenses([
     "notice",  # MIT from expression "MIT"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "winapi",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.2.8",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.2.8",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
diff --git a/cargo/remote/winapi-0.3.9.BUILD.bazel b/cargo/remote/BUILD.winapi-0.3.9.bazel
similarity index 73%
rename from cargo/remote/winapi-0.3.9.BUILD.bazel
rename to cargo/remote/BUILD.winapi-0.3.9.bazel
index 27a5827a9..675f5f6f8 100644
--- a/cargo/remote/winapi-0.3.9.BUILD.bazel
+++ b/cargo/remote/BUILD.winapi-0.3.9.bazel
@@ -28,91 +28,17 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "winapi_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build.rs",
-    edition = "2015",
-    deps = [
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    crate_features = [
-      "consoleapi",
-      "errhandlingapi",
-      "fileapi",
-      "handleapi",
-      "impl-debug",
-      "impl-default",
-      "knownfolders",
-      "lmcons",
-      "minschannel",
-      "minwinbase",
-      "minwindef",
-      "ntdef",
-      "ntsecapi",
-      "ntstatus",
-      "objbase",
-      "processenv",
-      "profileapi",
-      "schannel",
-      "securitybaseapi",
-      "shlobj",
-      "sspi",
-      "std",
-      "sysinfoapi",
-      "timezoneapi",
-      "winbase",
-      "wincon",
-      "wincrypt",
-      "winerror",
-      "winnt",
-      "winreg",
-      "winsock2",
-      "ws2def",
-      "ws2ipdef",
-      "ws2tcpip",
-      "wtypesbase",
-    ],
     build_script_env = {
     },
-    data = glob(["**"]),
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    version = "0.3.9",
-    visibility = ["//visibility:private"],
-)
-
-
-# buildifier: leave-alone
-rust_library(
-    name = "winapi",
-    crate_type = "lib",
-    deps = [
-        ":winapi_build_script",
-    ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2015",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.3.9",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
     crate_features = [
         "consoleapi",
         "errhandlingapi",
@@ -150,4 +76,75 @@ rust_library(
         "ws2tcpip",
         "wtypesbase",
     ],
+    crate_root = "build.rs",
+    data = glob(["**"]),
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.3.9",
+    visibility = ["//visibility:private"],
+    deps = [
+    ],
+)
+
+rust_library(
+    name = "winapi",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "consoleapi",
+        "errhandlingapi",
+        "fileapi",
+        "handleapi",
+        "impl-debug",
+        "impl-default",
+        "knownfolders",
+        "lmcons",
+        "minschannel",
+        "minwinbase",
+        "minwindef",
+        "ntdef",
+        "ntsecapi",
+        "ntstatus",
+        "objbase",
+        "processenv",
+        "profileapi",
+        "schannel",
+        "securitybaseapi",
+        "shlobj",
+        "sspi",
+        "std",
+        "sysinfoapi",
+        "timezoneapi",
+        "winbase",
+        "wincon",
+        "wincrypt",
+        "winerror",
+        "winnt",
+        "winreg",
+        "winsock2",
+        "ws2def",
+        "ws2ipdef",
+        "ws2tcpip",
+        "wtypesbase",
+    ],
+    crate_root = "src/lib.rs",
+    crate_type = "lib",
+    edition = "2015",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.3.9",
+    # buildifier: leave-alone
+    deps = [
+        ":winapi_build_script",
+    ],
 )
diff --git a/cargo/remote/winapi-build-0.1.1.BUILD.bazel b/cargo/remote/BUILD.winapi-build-0.1.1.bazel
similarity index 95%
rename from cargo/remote/winapi-build-0.1.1.BUILD.bazel
rename to cargo/remote/BUILD.winapi-build-0.1.1.bazel
index 175749ad6..44814dffe 100644
--- a/cargo/remote/winapi-build-0.1.1.BUILD.bazel
+++ b/cargo/remote/BUILD.winapi-build-0.1.1.bazel
@@ -28,7 +28,7 @@ licenses([
     "notice",  # MIT from expression "MIT"
 ])
 
-# Generated targets
+# Generated Targets
 
 alias(
     name = "winapi_build",
@@ -39,23 +39,23 @@ alias(
     ],
 )
 
-# buildifier: leave-alone
 rust_library(
     name = "build",
-    crate_type = "lib",
-    deps = [
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.1.1",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.1.1",
+    # buildifier: leave-alone
+    deps = [
     ],
 )
diff --git a/cargo/remote/winapi-i686-pc-windows-gnu-0.4.0.BUILD.bazel b/cargo/remote/BUILD.winapi-i686-pc-windows-gnu-0.4.0.bazel
similarity index 93%
rename from cargo/remote/winapi-i686-pc-windows-gnu-0.4.0.BUILD.bazel
rename to cargo/remote/BUILD.winapi-i686-pc-windows-gnu-0.4.0.bazel
index 9741d4f2e..d3e4c0270 100644
--- a/cargo/remote/winapi-i686-pc-windows-gnu-0.4.0.BUILD.bazel
+++ b/cargo/remote/BUILD.winapi-i686-pc-windows-gnu-0.4.0.bazel
@@ -28,56 +28,53 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "winapi_i686_pc_windows_gnu_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build.rs",
-    edition = "2015",
-    deps = [
+    build_script_env = {
+    },
+    crate_features = [
     ],
+    crate_root = "build.rs",
+    data = glob(["**"]),
+    edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    crate_features = [
-    ],
-    build_script_env = {
-    },
-    data = glob(["**"]),
     tags = [
         "cargo-raze",
         "manual",
     ],
     version = "0.4.0",
     visibility = ["//visibility:private"],
+    deps = [
+    ],
 )
 
-
-# buildifier: leave-alone
 rust_library(
     name = "winapi_i686_pc_windows_gnu",
-    crate_type = "lib",
-    deps = [
-        ":winapi_i686_pc_windows_gnu_build_script",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.4.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.4.0",
+    # buildifier: leave-alone
+    deps = [
+        ":winapi_i686_pc_windows_gnu_build_script",
     ],
 )
diff --git a/cargo/remote/winapi-util-0.1.5.BUILD.bazel b/cargo/remote/BUILD.winapi-util-0.1.5.bazel
similarity index 96%
rename from cargo/remote/winapi-util-0.1.5.BUILD.bazel
rename to cargo/remote/BUILD.winapi-util-0.1.5.bazel
index fe7177042..4db57b524 100644
--- a/cargo/remote/winapi-util-0.1.5.BUILD.bazel
+++ b/cargo/remote/BUILD.winapi-util-0.1.5.bazel
@@ -28,12 +28,27 @@ licenses([
     "unencumbered",  # Unlicense from expression "Unlicense OR MIT"
 ])
 
-# Generated targets
+# Generated Targets
 
-# buildifier: leave-alone
 rust_library(
     name = "winapi_util",
+    srcs = glob(["**/*.rs"]),
+    aliases = {
+    },
+    crate_features = [
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.1.5",
+    # buildifier: leave-alone
     deps = [
     ] + selects.with_or({
         # cfg(windows)
@@ -45,19 +60,4 @@ rust_library(
         ],
         "//conditions:default": [],
     }),
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.1.5",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-    ],
-    aliases = {
-    },
 )
diff --git a/cargo/remote/winapi-x86_64-pc-windows-gnu-0.4.0.BUILD.bazel b/cargo/remote/BUILD.winapi-x86_64-pc-windows-gnu-0.4.0.bazel
similarity index 93%
rename from cargo/remote/winapi-x86_64-pc-windows-gnu-0.4.0.BUILD.bazel
rename to cargo/remote/BUILD.winapi-x86_64-pc-windows-gnu-0.4.0.bazel
index 1aad8a701..8e89aa9c1 100644
--- a/cargo/remote/winapi-x86_64-pc-windows-gnu-0.4.0.BUILD.bazel
+++ b/cargo/remote/BUILD.winapi-x86_64-pc-windows-gnu-0.4.0.bazel
@@ -28,56 +28,53 @@ licenses([
     "notice",  # MIT from expression "MIT OR Apache-2.0"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "winapi_x86_64_pc_windows_gnu_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build.rs",
-    edition = "2015",
-    deps = [
+    build_script_env = {
+    },
+    crate_features = [
     ],
+    crate_root = "build.rs",
+    data = glob(["**"]),
+    edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    crate_features = [
-    ],
-    build_script_env = {
-    },
-    data = glob(["**"]),
     tags = [
         "cargo-raze",
         "manual",
     ],
     version = "0.4.0",
     visibility = ["//visibility:private"],
+    deps = [
+    ],
 )
 
-
-# buildifier: leave-alone
 rust_library(
     name = "winapi_x86_64_pc_windows_gnu",
-    crate_type = "lib",
-    deps = [
-        ":winapi_x86_64_pc_windows_gnu_build_script",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.4.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.4.0",
+    # buildifier: leave-alone
+    deps = [
+        ":winapi_x86_64_pc_windows_gnu_build_script",
     ],
 )
diff --git a/cargo/remote/winreg-0.7.0.BUILD.bazel b/cargo/remote/BUILD.winreg-0.7.0.bazel
similarity index 95%
rename from cargo/remote/winreg-0.7.0.BUILD.bazel
rename to cargo/remote/BUILD.winreg-0.7.0.bazel
index dff30da00..c49a13428 100644
--- a/cargo/remote/winreg-0.7.0.BUILD.bazel
+++ b/cargo/remote/BUILD.winreg-0.7.0.bazel
@@ -28,31 +28,36 @@ licenses([
     "notice",  # MIT from expression "MIT"
 ])
 
-# Generated targets
+# Generated Targets
+
 # Unsupported target "basic_usage" with type "example" omitted
+
 # Unsupported target "enum" with type "example" omitted
+
 # Unsupported target "installed_apps" with type "example" omitted
+
 # Unsupported target "serialization" with type "example" omitted
+
 # Unsupported target "transactions" with type "example" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "winreg",
-    crate_type = "lib",
-    deps = [
-        "@raze__winapi__0_3_9//:winapi",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.7.0",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.7.0",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__winapi__0_3_9//:winapi",
     ],
 )
diff --git a/cargo/remote/ws2_32-sys-0.2.1.BUILD.bazel b/cargo/remote/BUILD.ws2_32-sys-0.2.1.bazel
similarity index 94%
rename from cargo/remote/ws2_32-sys-0.2.1.BUILD.bazel
rename to cargo/remote/BUILD.ws2_32-sys-0.2.1.bazel
index e023eab9a..89521f708 100644
--- a/cargo/remote/ws2_32-sys-0.2.1.BUILD.bazel
+++ b/cargo/remote/BUILD.ws2_32-sys-0.2.1.bazel
@@ -28,39 +28,36 @@ licenses([
     "notice",  # MIT from expression "MIT"
 ])
 
-# Generated targets
-# buildifier: disable=load-on-top
+# Generated Targets# buildifier: disable=load-on-top
 load(
     "@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
 
-# buildifier: leave-alone
 cargo_build_script(
     name = "ws2_32_sys_build_script",
     srcs = glob(["**/*.rs"]),
-    crate_root = "build.rs",
-    edition = "2015",
-    deps = [
-        "@raze__winapi_build__0_1_1//:winapi_build",
+    build_script_env = {
+    },
+    crate_features = [
     ],
+    crate_root = "build.rs",
+    data = glob(["**"]),
+    edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    crate_features = [
-    ],
-    build_script_env = {
-    },
-    data = glob(["**"]),
     tags = [
         "cargo-raze",
         "manual",
     ],
     version = "0.2.1",
     visibility = ["//visibility:private"],
+    deps = [
+        "@raze__winapi_build__0_1_1//:winapi_build",
+    ],
 )
 
-
 alias(
     name = "ws2_32_sys",
     actual = ":ws2_32",
@@ -70,25 +67,25 @@ alias(
     ],
 )
 
-# buildifier: leave-alone
 rust_library(
     name = "ws2_32",
-    crate_type = "lib",
-    deps = [
-        ":ws2_32_sys_build_script",
-        "@raze__winapi__0_2_8//:winapi",
-    ],
     srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
     crate_root = "src/lib.rs",
+    crate_type = "lib",
     edition = "2015",
     rustc_flags = [
         "--cap-lints=allow",
     ],
-    version = "0.2.1",
     tags = [
         "cargo-raze",
         "manual",
     ],
-    crate_features = [
+    version = "0.2.1",
+    # buildifier: leave-alone
+    deps = [
+        ":ws2_32_sys_build_script",
+        "@raze__winapi__0_2_8//:winapi",
     ],
 )
diff --git a/cargo/remote/zip-0.5.6.BUILD.bazel b/cargo/remote/BUILD.zip-0.5.6.bazel
similarity index 96%
rename from cargo/remote/zip-0.5.6.BUILD.bazel
rename to cargo/remote/BUILD.zip-0.5.6.bazel
index 8bb497863..028394a88 100644
--- a/cargo/remote/zip-0.5.6.BUILD.bazel
+++ b/cargo/remote/BUILD.zip-0.5.6.bazel
@@ -28,42 +28,52 @@ licenses([
     "notice",  # MIT from expression "MIT"
 ])
 
-# Generated targets
-# Unsupported target "end_to_end" with type "test" omitted
-# Unsupported target "extract" with type "example" omitted
-# Unsupported target "extract_lorem" with type "example" omitted
-# Unsupported target "file_info" with type "example" omitted
-# Unsupported target "invalid_date" with type "test" omitted
+# Generated Targets
+
 # Unsupported target "read_entry" with type "bench" omitted
+
+# Unsupported target "extract" with type "example" omitted
+
+# Unsupported target "extract_lorem" with type "example" omitted
+
+# Unsupported target "file_info" with type "example" omitted
+
 # Unsupported target "stdin_info" with type "example" omitted
+
 # Unsupported target "write_dir" with type "example" omitted
+
 # Unsupported target "write_sample" with type "example" omitted
 
-# buildifier: leave-alone
 rust_library(
     name = "zip",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+        "deflate",
+        "flate2",
+        "time",
+    ],
+    crate_root = "src/lib.rs",
     crate_type = "lib",
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.5.6",
+    # buildifier: leave-alone
     deps = [
         "@raze__crc32fast__1_2_1//:crc32fast",
         "@raze__flate2__1_0_19//:flate2",
         "@raze__podio__0_1_7//:podio",
         "@raze__time__0_1_44//:time",
     ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.5.6",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-        "deflate",
-        "flate2",
-        "time",
-    ],
 )
+
+# Unsupported target "end_to_end" with type "test" omitted
+
+# Unsupported target "invalid_date" with type "test" omitted
+
 # Unsupported target "zip64_large" with type "test" omitted
diff --git a/cargo/remote/coarsetime-0.1.14.BUILD.bazel b/cargo/remote/coarsetime-0.1.14.BUILD.bazel
deleted file mode 100644
index a07644d2a..000000000
--- a/cargo/remote/coarsetime-0.1.14.BUILD.bazel
+++ /dev/null
@@ -1,54 +0,0 @@
-"""
-@generated
-cargo-raze crate build file.
-
-DO NOT EDIT! Replaced on runs of cargo-raze
-"""
-
-# buildifier: disable=load
-load(
-    "@io_bazel_rules_rust//rust:rust.bzl",
-    "rust_binary",
-    "rust_library",
-    "rust_test",
-)
-
-# buildifier: disable=load
-load("@bazel_skylib//lib:selects.bzl", "selects")
-
-package(default_visibility = [
-    # Public for visibility by "@raze__crate__version//" targets.
-    #
-    # Prefer access through "//cargo", which limits external
-    # visibility to explicit Cargo.toml dependencies.
-    "//visibility:public",
-])
-
-licenses([
-    "notice",  # ISC from expression "ISC"
-])
-
-# Generated targets
-
-# buildifier: leave-alone
-rust_library(
-    name = "coarsetime",
-    crate_type = "lib",
-    deps = [
-        "@raze__lazy_static__1_4_0//:lazy_static",
-        "@raze__libc__0_2_80//:libc",
-    ],
-    srcs = glob(["**/*.rs"]),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    version = "0.1.14",
-    tags = [
-        "cargo-raze",
-        "manual",
-    ],
-    crate_features = [
-    ],
-)