diff --git a/shim/shims.bzl b/shim/shims.bzl
index 63f36c65..b332c566 100644
--- a/shim/shims.bzl
+++ b/shim/shims.bzl
@@ -163,7 +163,6 @@ def rust_protobuf_library(
             visibility = ["PUBLIC"],
         )
 
-
 def ocaml_binary(
         deps = [],
         visibility = ["PUBLIC"],
diff --git a/shim/third-party/rust/Cargo.toml b/shim/third-party/rust/Cargo.toml
index 57f993e4..159980c9 100644
--- a/shim/third-party/rust/Cargo.toml
+++ b/shim/third-party/rust/Cargo.toml
@@ -1,39 +1,225 @@
-# @generated by autocargo from //common/ocaml/interop/shim/third-party/rust:top
+# Definitions of third-party libraries used for buck2 build of buck2.
+# This file is **not** used by cargo build of buck2.
+# See the <project_root>/docs/bootstrapping.md for more details.
+
+[workspace]
 
 [package]
-name = "top"
-version = "0.1.0"
-authors = ["Shayne Fletcher <shaynefletcher@meta.com>", "Jake Bailey <jakebailey@meta.com>", "Vincent Siles <vsiles@meta.com>", "Meta"]
+# Pseudo-package whose dependencies are imported and buckified
+name = "rust-third-party"
+version = "0.0.0"
+publish = false
 edition = "2021"
-readme = "../../../README.md"
-repository = "https://github.com/facebook/ocamlrep"
-license = "MIT"
 
+# Dummy target to keep Cargo happy
 [[bin]]
 name = "top"
 path = "top/main.rs"
 
+# List of packages to be imported, with version constraints, features
+# and all options Cargo supports.
 [dependencies]
-anyhow = "1.0.75"
+
+gazebo = {version = "0.8.1", features = ["str_pattern_extensions"]}
+fbinit = "0.1"
+sorted_vector_map = "0.1"
+watchman_client = "0.8.0"
+
+annotate-snippets = { version = "0.9.0", features = ["color"] }
+anyhow = "1.0.65"
+anymap = "0.12.1"
+arc-swap = "1.6.0"
+argfile = "0.1.0"
+assert_matches = "1.5"
+async-compression = { version = "0.4.1", features = ["tokio", "gzip", "zstd"] }
+async-condvar-fair = { version = "0.2.2", features = ["parking_lot_0_11", "tokio"] }
+async-recursion = "1.0"
+async-scoped = { version = "0.8", features = ["use-tokio"] }
+async-trait = "0.1.24"
+atomic = "0.5.1"
+backtrace = "0.3.51"
+base64 = "0.13.0"
+bincode = "1.3.3"
 bitflags = "2.4"
+blake3 = { version = "1.3.1", features = [ "default", "digest", "rayon", "std", "traits-preview" ] }
 bstr = { version = "1.4.0", features = ["serde", "std", "unicode"] }
 bumpalo = { version = "3.14.0", features = ["allocator_api", "collections"] }
-clap-3 = { package = "clap", version = "3.2.25", features = ["derive", "env", "regex", "unicode", "wrap_help"] }
+byteorder = "1.4.3"
+bytes = "1.0"
+bytesize = "1.1.0"
+chrono = "0.4.28"
+clap = { package = "clap", version = "4.0.7", features = ["derive", "env"] }
+clap-3 = { package = "clap", version = "3.2.24", features = ["derive", "env", "regex", "unicode", "wrap_help"] }
+common-path = "1.0.0"
+compact_str = "0.6.1"
+constant_time_eq = "0.2.4"
 convert_case = "0.4.0"
-derive_more = "0.99.17"
+criterion = { version = "0.3.1", features = [] }
+crossbeam = "0.8"
+crossbeam-channel = "0.5"
+crossbeam-epoch = "0.9.7"
+crossterm = "0.27"
+csv = "1.1"
+ctor = "0.1.16"
+dashmap = "5.5.3"
+debugserver-types = "0.5.0"
+derivative = "2.2"
+derive_more = "0.99.3"
+digest = "0.10"
+dirs = "3.0.1"
+dunce = "1.0.2"
+either = "1.8"
+enum-iterator = "1.4.1"
+enum-map = "0.6.3"
+env_logger = "0.9.0"
+equivalent = "1.0.0"
+erased-serde = "0.3.20"
+faccess = "0.2.3"
+fancy-regex = "0.10.0"
+flate2 = "1.0.22"
+fnv = "1.0.7"
+fs4 = { version = "0.6", features = ["sync"] }
+futures = { version = "0.3.28", features = ["async-await", "compat"] }
+futures-intrusive = "0.4"
+fxhash = "0.2.1"
+glob = "0.3.0"
+globset = "0.4.10"
+hashbrown = { version = "0.14.3", features = ["raw"] }
 hex = "0.4.3"
-indexmap = { version = "2.1.0", features = ["arbitrary", "rayon", "serde"] }
+higher-order-closure = "0.0.5"
+hostname = "0.3.1"
+http = "0.2"
+httparse = "1.7.1"
+httptest = "0.15"
+humantime = "2.0.1"
+hyper = { version = "0.14.26", features = ["client", "http1", "http2"] }
+hyper-proxy = { git = "https://github.com/get9/hyper-proxy", rev = "205e9fee42d469444d654d9fa207897f4a77d5b6", features = ["rustls"], default_features = false } # branch = tokio-rustls-0.23 Many PRs to bump versions (#28, #30, #31) are several years old, possibly abandoned crate. This fork contains changes from #28 + changes to upgrade rustls to 0.21.
+hyper-rustls = { version = "0.24.0", features = ["http2"] }
+hyper-timeout = "0.4"
+hyper-unix-connector = "0.2"
+indent_write = "2.2.0"
+indenter = "0.3.3"
+indexmap = { version = "1.9.1", features = ["arbitrary", "rayon", "serde-1"] }
+indoc = "1.0.3"
+inferno = { version = "0.11.11", default-features = false }
+internment = { version = "0.7", features = ["arc"] }
+inventory = "0.3.8"
+ipnetwork = "0.20.0"
+is_proc_translated = "0.1.1"
+itertools = "0.10.3"
+jemallocator = { version = "0.5.0", features = ["profiling"] }
+lalrpop = { version = "0.19.7", artifact = "bin", features = ["pico-args"] }
+lalrpop-util = "0.19.7"
+libc = "0.2.132"
+linked-hash-map = { version = "0.5", features = ["serde_impl"] }
+linkme = { version = "0.3.17", features = ["used_linker"] }
+log = "0.4"
+logos = "0.12"
+lsp-server = "0.7.2"
+lsp-types = "0.94.1"
+maplit = "1.0.2"
+mappable-rc = { version = "0.1.1", features = ["std"] }
 md-5 = "0.10"
-once_cell = "1.12"
+memchr = "2.4.1"
+memmap2 = "0.5.0"
+memoffset = "0.6.4"
+multimap = "0.8.2"
+nix = "0.22"
+nom = "7.1.3"
+notify = "=5.0.0-pre.16"
+num-bigint = "0.4.3"
+num-traits = "0.2"
+num_cpus = "1.11"
+num_enum = "0.5"
+object = "0.29.0"
+once_cell = "1.8"
+os_str_bytes = { version = "6.6.0", features = ["conversions"] }
+parking_lot = { version = "0.11.2", features = ["send_guard"] }
+paste = "1.0"
+pathdiff = "0.2"
+perf-event = "0.4"
+perf-event-open-sys = "4.0"
+pin-project = "0.4.29"
+plist = "0.5"
+pretty_assertions = "1.2.1"
 proc-macro2 = { version = "1.0.70", features = ["span-locations"] }
-quote = "1.0.29"
-regex = "1.9.2"
+prost = "0.11.9"
+prost-build = "0.11.9"
+prost-derive = "0.11.9"
+prost-types = "0.11.9"
+protoc-bin-vendored = "3.0.0"
+psutil = "3.2"
+quote = "1.0.3"
+rand = { version = "0.8.4", features = ["small_rng"] }
+rand_chacha = "0.3"
+rand_distr = "0.4"
+ref-cast = "1.0.0"
+regex = "1.5.4"
+relative-path = { version = "1.7.0", features = ["serde"] }
+ring = "=0.17.5" # Upgrading this is possible, but a pain, so we don't want to pick up every new minor version
+rusqlite = { version = "0.29.0", features = ["bundled"] }
 rustc-hash = "1.1.0"
-serde = { version = "1.0.185", features = ["derive", "rc"] }
+rustls = "0.21.0"
+rustls-native-certs = { package = "rustls-native-certs", version = "0.6.2" }
+rustls-pemfile = { package = "rustls-pemfile", version = "1.0.0" }
+rustyline = "11.0"
+scopeguard = "1.0.0"
+sequence_trie = "0.3.6"
+serde = { version = "1.0.173", features = ["derive", "rc"] }
+serde_json = "1.0.48"
+sha1 = "0.10"
+sha2 = "0.10"
+shlex = "1.3"
 similar = { version = "2.2.0", features = ["inline"] }
+siphasher = "0.3.3"
+slab = "0.4.7"
+slog = "2.7.0"
+smallvec = { version = "1.10", features = ["const_generics", "const_new", "serde", "specialization", "union", "write"] }
+static_assertions = "1.1.0"
+strsim = "0.10.0"
+structopt = "0.3.23"
+syn = { version = "2", features = ["extra-traits", "full", "visit"] }
 syn1 = { package = "syn", version = "1.0.109", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] }
 synstructure = "0.12"
-tempfile = "3.8"
-thiserror = "1.0.49"
-toml = "0.8.4"
-walkdir = "2.3"
+sync_wrapper = "0.1.0"
+sys-info = "0.9.1"
+sysinfo = "0.26.8"
+take_mut = "0.2.2"
+tar = "0.4.38"
+tempfile = "3.1.0"
+termimad = "0.20.1"
+termios = "0.3"
+termwiz = "0.18"
+test-case = "3.1.0"
+textwrap = { version = "0.11", features = ["term_size"] }
+thiserror = "1.0.36"
+threadpool = "1.8.1"
+tokio = { version = "1.25.0", features = ["full", "test-util", "tracing"] }
+tokio-rustls = { package = "tokio-rustls", version = "0.24.0", features = ["dangerous_configuration"] }
+tokio-stream = { version = "0.1.14", features = ["fs", "io-util", "net", "sync", "time", "signal"] }
+tokio-util = { version = "0.6", features = ["full"] }
+toml = "0.5"
+tonic = { version = "0.9.2", features = ["tls", "tls-webpki-roots"] }
+tonic-build = { version = "0.9.2", features = ["prost", "cleanup-markdown"] }
+tower = "0.4"
+tower-layer = "0.3.1"
+tower-service = "0.3.2"
+tracing = "0.1.22"
+tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+triomphe = "0.1.11"
+trybuild = "1.0.56"
+twox-hash = "1.6.1"
+unicode-segmentation = "1.7"
+uuid = { version = "1.2", features = ["v4"] }
+walkdir = "2.3.2"
+which = "4.3.0"
+windows_x86_64_msvc = "=0.48.0"  # our fixup only works if we are on precisely 0.48.0
+winapi = { version = "0.3", features = ["everything"] }
+xattr = "0.2.2"
+zip = "0.5"
+zstd = "0.13.0"
+
+[patch.crates-io]
+# For https://github.com/jimblandy/perf-event/pull/29
+perf-event = { git = "https://github.com/krallin/perf-event.git", rev = "86224a9bc025d5d19f719542f27c8c629a08b167", version = "0.4" }
+perf-event-open-sys = { git = "https://github.com/krallin/perf-event.git", rev = "86224a9bc025d5d19f719542f27c8c629a08b167", version = "4.0" }
diff --git a/shim/third-party/rust/fixups/anyhow/fixups.toml b/shim/third-party/rust/fixups/anyhow/fixups.toml
index 5e026f75..db40d72c 100644
--- a/shim/third-party/rust/fixups/anyhow/fixups.toml
+++ b/shim/third-party/rust/fixups/anyhow/fixups.toml
@@ -1,2 +1 @@
-[[buildscript]]
-[buildscript.rustc_flags]
+buildscript = []
diff --git a/shim/third-party/rust/fixups/clap/fixups.toml b/shim/third-party/rust/fixups/clap/fixups.toml
index 91e32def..ee94fdc2 100644
--- a/shim/third-party/rust/fixups/clap/fixups.toml
+++ b/shim/third-party/rust/fixups/clap/fixups.toml
@@ -1,7 +1 @@
-extra_srcs = ["README.md"]
 omit_features = ["deprecated"]
-
-[platform_fixup.'cfg(all())']
-version = ">= 3.2.17"
-omit_features = ["deprecated"]
-extra_srcs = ["README.md", "examples/demo.md", "examples/demo.rs"]
diff --git a/shim/third-party/rust/fixups/clap_derive/fixups.toml b/shim/third-party/rust/fixups/clap_derive/fixups.toml
index 59ce4d48..ee94fdc2 100644
--- a/shim/third-party/rust/fixups/clap_derive/fixups.toml
+++ b/shim/third-party/rust/fixups/clap_derive/fixups.toml
@@ -1,2 +1 @@
-extra_srcs = ["README.md"]
 omit_features = ["deprecated"]
diff --git a/shim/third-party/rust/fixups/crossbeam-epoch/fixups.toml b/shim/third-party/rust/fixups/crossbeam-epoch/fixups.toml
index 46dfe3a3..35109284 100644
--- a/shim/third-party/rust/fixups/crossbeam-epoch/fixups.toml
+++ b/shim/third-party/rust/fixups/crossbeam-epoch/fixups.toml
@@ -1,4 +1,2 @@
+buildscript = []
 cargo_env = true
-
-[[buildscript]]
-[buildscript.rustc_flags]
diff --git a/shim/third-party/rust/fixups/crossbeam-utils/fixups.toml b/shim/third-party/rust/fixups/crossbeam-utils/fixups.toml
index 46dfe3a3..35109284 100644
--- a/shim/third-party/rust/fixups/crossbeam-utils/fixups.toml
+++ b/shim/third-party/rust/fixups/crossbeam-utils/fixups.toml
@@ -1,4 +1,2 @@
+buildscript = []
 cargo_env = true
-
-[[buildscript]]
-[buildscript.rustc_flags]
diff --git a/shim/third-party/rust/fixups/generic-array/fixups.toml b/shim/third-party/rust/fixups/generic-array/fixups.toml
index 5e026f75..db40d72c 100644
--- a/shim/third-party/rust/fixups/generic-array/fixups.toml
+++ b/shim/third-party/rust/fixups/generic-array/fixups.toml
@@ -1,2 +1 @@
-[[buildscript]]
-[buildscript.rustc_flags]
+buildscript = []
diff --git a/shim/third-party/rust/fixups/indexmap/fixups.toml b/shim/third-party/rust/fixups/indexmap/fixups.toml
index 5e026f75..4aa45eda 100644
--- a/shim/third-party/rust/fixups/indexmap/fixups.toml
+++ b/shim/third-party/rust/fixups/indexmap/fixups.toml
@@ -1,2 +1,2 @@
-[[buildscript]]
-[buildscript.rustc_flags]
+buildscript = []
+cfgs = ["has_std"]
diff --git a/shim/third-party/rust/fixups/libc/fixups.toml b/shim/third-party/rust/fixups/libc/fixups.toml
index fc1e9e9c..5e026f75 100644
--- a/shim/third-party/rust/fixups/libc/fixups.toml
+++ b/shim/third-party/rust/fixups/libc/fixups.toml
@@ -1,12 +1,2 @@
 [[buildscript]]
 [buildscript.rustc_flags]
-
-# Third-party glibc points to x84_64 C runtime only compatible with server platforms.
-[platform_fixup.'cfg(target_env = "fbcode")']
-buildscript = []
-extra_deps = [
-    "third-party//glibc:c",
-    "third-party//glibc:rt",
-    "third-party//glibc:util",
-    "third-party//glibc:pthread",
-]
diff --git a/shim/third-party/rust/fixups/memchr/fixups.toml b/shim/third-party/rust/fixups/memchr/fixups.toml
index 5e026f75..db40d72c 100644
--- a/shim/third-party/rust/fixups/memchr/fixups.toml
+++ b/shim/third-party/rust/fixups/memchr/fixups.toml
@@ -1,2 +1 @@
-[[buildscript]]
-[buildscript.rustc_flags]
+buildscript = []
diff --git a/shim/third-party/rust/fixups/memoffset/fixups.toml b/shim/third-party/rust/fixups/memoffset/fixups.toml
index 5e026f75..db40d72c 100644
--- a/shim/third-party/rust/fixups/memoffset/fixups.toml
+++ b/shim/third-party/rust/fixups/memoffset/fixups.toml
@@ -1,2 +1 @@
-[[buildscript]]
-[buildscript.rustc_flags]
+buildscript = []
diff --git a/shim/third-party/rust/fixups/proc-macro-error-attr/fixups.toml b/shim/third-party/rust/fixups/proc-macro-error-attr/fixups.toml
index 5e026f75..db40d72c 100644
--- a/shim/third-party/rust/fixups/proc-macro-error-attr/fixups.toml
+++ b/shim/third-party/rust/fixups/proc-macro-error-attr/fixups.toml
@@ -1,2 +1 @@
-[[buildscript]]
-[buildscript.rustc_flags]
+buildscript = []
diff --git a/shim/third-party/rust/fixups/proc-macro-error/fixups.toml b/shim/third-party/rust/fixups/proc-macro-error/fixups.toml
index 5e026f75..db40d72c 100644
--- a/shim/third-party/rust/fixups/proc-macro-error/fixups.toml
+++ b/shim/third-party/rust/fixups/proc-macro-error/fixups.toml
@@ -1,2 +1 @@
-[[buildscript]]
-[buildscript.rustc_flags]
+buildscript = []
diff --git a/shim/third-party/rust/fixups/quote/fixups.toml b/shim/third-party/rust/fixups/quote/fixups.toml
index 5e026f75..db40d72c 100644
--- a/shim/third-party/rust/fixups/quote/fixups.toml
+++ b/shim/third-party/rust/fixups/quote/fixups.toml
@@ -1,2 +1 @@
-[[buildscript]]
-[buildscript.rustc_flags]
+buildscript = []
diff --git a/shim/third-party/rust/fixups/rayon-core/fixups.toml b/shim/third-party/rust/fixups/rayon-core/fixups.toml
index 5e026f75..db40d72c 100644
--- a/shim/third-party/rust/fixups/rayon-core/fixups.toml
+++ b/shim/third-party/rust/fixups/rayon-core/fixups.toml
@@ -1,2 +1 @@
-[[buildscript]]
-[buildscript.rustc_flags]
+buildscript = []
diff --git a/shim/third-party/rust/fixups/rustix/fixups.toml b/shim/third-party/rust/fixups/rustix/fixups.toml
index cce2b67b..5e026f75 100644
--- a/shim/third-party/rust/fixups/rustix/fixups.toml
+++ b/shim/third-party/rust/fixups/rustix/fixups.toml
@@ -1,2 +1,2 @@
- [[buildscript]]
- [buildscript.rustc_flags]
+[[buildscript]]
+[buildscript.rustc_flags]
diff --git a/shim/third-party/rust/fixups/serde/fixups.toml b/shim/third-party/rust/fixups/serde/fixups.toml
index 5e026f75..db40d72c 100644
--- a/shim/third-party/rust/fixups/serde/fixups.toml
+++ b/shim/third-party/rust/fixups/serde/fixups.toml
@@ -1,2 +1 @@
-[[buildscript]]
-[buildscript.rustc_flags]
+buildscript = []
diff --git a/shim/third-party/rust/fixups/syn/fixups.toml b/shim/third-party/rust/fixups/syn/fixups.toml
index 5e026f75..db40d72c 100644
--- a/shim/third-party/rust/fixups/syn/fixups.toml
+++ b/shim/third-party/rust/fixups/syn/fixups.toml
@@ -1,2 +1 @@
-[[buildscript]]
-[buildscript.rustc_flags]
+buildscript = []
diff --git a/shim/third-party/rust/fixups/thiserror/fixups.toml b/shim/third-party/rust/fixups/thiserror/fixups.toml
index 5e026f75..db40d72c 100644
--- a/shim/third-party/rust/fixups/thiserror/fixups.toml
+++ b/shim/third-party/rust/fixups/thiserror/fixups.toml
@@ -1,2 +1 @@
-[[buildscript]]
-[buildscript.rustc_flags]
+buildscript = []
diff --git a/shim/third-party/rust/fixups/typenum/fixups.toml b/shim/third-party/rust/fixups/typenum/fixups.toml
index 1377d4ae..7ab02e4f 100644
--- a/shim/third-party/rust/fixups/typenum/fixups.toml
+++ b/shim/third-party/rust/fixups/typenum/fixups.toml
@@ -1,6 +1,3 @@
-# See https://github.com/paholg/typenum/pull/147. Typenum does something silly
-# with `include!` by default and added this feature for Bazel because Bazel
-# couldn't deal with the silly thing either.
 features = ["force_unix_path_separator"]
 
 [[buildscript]]
diff --git a/shim/third-party/rust/fixups/unicase/fixups.toml b/shim/third-party/rust/fixups/unicase/fixups.toml
index 5e026f75..db40d72c 100644
--- a/shim/third-party/rust/fixups/unicase/fixups.toml
+++ b/shim/third-party/rust/fixups/unicase/fixups.toml
@@ -1,2 +1 @@
-[[buildscript]]
-[buildscript.rustc_flags]
+buildscript = []
diff --git a/shim/third-party/rust/fixups/winapi-x86_64-pc-windows-gnu/fixups.toml b/shim/third-party/rust/fixups/winapi-x86_64-pc-windows-gnu/fixups.toml
index db40d72c..07c79834 100644
--- a/shim/third-party/rust/fixups/winapi-x86_64-pc-windows-gnu/fixups.toml
+++ b/shim/third-party/rust/fixups/winapi-x86_64-pc-windows-gnu/fixups.toml
@@ -1 +1,9 @@
 buildscript = []
+
+[[platform_fixup.'cfg(target_os = "windows")'.buildscript]]
+[platform_fixup.'cfg(target_os = "windows")'.buildscript.prebuilt_cxx_library]
+name = "extra_libraries"
+# The static_libs this crate provides overlaps quite heavily with those in a default
+# MinGW install, and there are also many that are DirectX specific.
+# We list only those we actually need, since the others are more likely to cause problems.
+static_libs = ["lib/libwinapi_ole32.a", "lib/libwinapi_shell32.a"]
diff --git a/shim/third-party/rust/fixups/winapi/fixups.toml b/shim/third-party/rust/fixups/winapi/fixups.toml
index db40d72c..ec4f86e5 100644
--- a/shim/third-party/rust/fixups/winapi/fixups.toml
+++ b/shim/third-party/rust/fixups/winapi/fixups.toml
@@ -1 +1,4 @@
 buildscript = []
+
+[[platform_fixup.'cfg(target_os = "windows")'.buildscript]]
+[platform_fixup.'cfg(target_os = "windows")'.buildscript.rustc_flags]
diff --git a/shim/third-party/rust/fixups/windows-targets/fixups.toml b/shim/third-party/rust/fixups/windows-targets/fixups.toml
new file mode 100644
index 00000000..b3555c77
--- /dev/null
+++ b/shim/third-party/rust/fixups/windows-targets/fixups.toml
@@ -0,0 +1,3 @@
+[platform_fixup.'cfg(any(target_os = "windows", target_os = "linux"))']
+version = ">=0.48.0"
+cfgs = ["windows_raw_dylib"]
diff --git a/shim/third-party/rust/fixups/windows_x86_64_gnu/fixups.toml b/shim/third-party/rust/fixups/windows_x86_64_gnu/fixups.toml
index db40d72c..b25e7f05 100644
--- a/shim/third-party/rust/fixups/windows_x86_64_gnu/fixups.toml
+++ b/shim/third-party/rust/fixups/windows_x86_64_gnu/fixups.toml
@@ -1 +1,8 @@
-buildscript = []
+buildscript = []
+
+[platform_fixup.'cfg(all(target_os = "windows", target_env = "gnu"))']
+version = "=0.48.0"
+[[platform_fixup.'cfg(all(target_os = "windows", target_env = "gnu"))'.buildscript]]
+[platform_fixup.'cfg(all(target_os = "windows", target_env = "gnu"))'.buildscript.prebuilt_cxx_library]
+name = "libwindows"
+static_libs = ["lib/libwindows.0.48.0.a"]
diff --git a/shim/third-party/rust/fixups/windows_x86_64_gnullvm/fixups.toml b/shim/third-party/rust/fixups/windows_x86_64_gnullvm/fixups.toml
index db40d72c..a5579b69 100644
--- a/shim/third-party/rust/fixups/windows_x86_64_gnullvm/fixups.toml
+++ b/shim/third-party/rust/fixups/windows_x86_64_gnullvm/fixups.toml
@@ -1 +1,8 @@
-buildscript = []
+buildscript = []
+
+[platform_fixup.'cfg(all(target_os = "linux", target_arch = "x86_64"))']
+version = "=0.48.0"
+[[platform_fixup.'cfg(all(target_os = "linux", target_arch = "x86_64"))'.buildscript]]
+[platform_fixup.'cfg(all(target_os = "linux", target_arch = "x86_64"))'.buildscript.prebuilt_cxx_library]
+name = "libwindows"
+static_libs = ["lib/libwindows.0.48.0.a"]
diff --git a/shim/third-party/rust/fixups/windows_x86_64_msvc/fixups.toml b/shim/third-party/rust/fixups/windows_x86_64_msvc/fixups.toml
index db40d72c..8e8dea35 100644
--- a/shim/third-party/rust/fixups/windows_x86_64_msvc/fixups.toml
+++ b/shim/third-party/rust/fixups/windows_x86_64_msvc/fixups.toml
@@ -1 +1,8 @@
-buildscript = []
+buildscript = []
+
+[platform_fixup.'cfg(all(target_os = "windows", target_env = "msvc"))']
+version = "=0.48.0"
+[[platform_fixup.'cfg(all(target_os = "windows", target_env = "msvc"))'.buildscript]]
+[platform_fixup.'cfg(all(target_os = "windows", target_env = "msvc"))'.buildscript.prebuilt_cxx_library]
+name = "windows"
+static_libs = ["lib/windows.0.48.0.lib"]
diff --git a/shim/third-party/rust/reindeer.toml b/shim/third-party/rust/reindeer.toml
index 8cf15fa2..4aa852e0 100644
--- a/shim/third-party/rust/reindeer.toml
+++ b/shim/third-party/rust/reindeer.toml
@@ -9,7 +9,15 @@ precise_srcs = true
 # Include a public top-level target which depends on all other targets.
 include_top_level = true
 
+[cargo]
+# Support Cargo's unstable "artifact dependencies" functionality, RFC 3028.
+bindeps = true
+
 [buck]
+# Name of the generated file.
+file_name = "BUCK"
+
+# Rules used for various kinds of targets.
 rust_library = "cargo.rust_library"
 rust_binary = "cargo.rust_binary"
 prebuilt_cxx_library = "third_party_rust_prebuilt_cxx_library"