diff --git a/Cargo.lock b/Cargo.lock
index 2d00f31e3159a..1a88bd8480515 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2423,18 +2423,30 @@ dependencies = [
 
 [[package]]
 name = "openssl"
-version = "0.10.30"
+version = "0.10.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4"
+checksum = "518915b97df115dd36109bfa429a48b8f737bd05508cf9588977b599648926d2"
 dependencies = [
  "bitflags",
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
  "foreign-types",
- "lazy_static",
  "libc",
+ "once_cell",
+ "openssl-macros",
  "openssl-sys",
 ]
 
+[[package]]
+name = "openssl-macros"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "openssl-probe"
 version = "0.1.2"
@@ -2452,9 +2464,9 @@ dependencies = [
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.58"
+version = "0.9.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de"
+checksum = "666416d899cf077260dac8698d60a60b435a46d57e82acb1be3d0dad87284e5b"
 dependencies = [
  "autocfg",
  "cc",
diff --git a/src/tools/cargo b/src/tools/cargo
deleted file mode 160000
index 3c44c3c4b7900..0000000000000
--- a/src/tools/cargo
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3c44c3c4b7900b8b13c85ead25ccaa8abb7d8989
diff --git a/src/tools/cargo/Cargo.toml b/src/tools/cargo/Cargo.toml
new file mode 100644
index 0000000000000..19f0ddb3238ad
--- /dev/null
+++ b/src/tools/cargo/Cargo.toml
@@ -0,0 +1,117 @@
+[package]
+name = "cargo"
+version = "0.54.0"
+edition = "2018"
+authors = ["Yehuda Katz <wycats@gmail.com>",
+           "Carl Lerche <me@carllerche.com>",
+           "Alex Crichton <alex@alexcrichton.com>"]
+license = "MIT OR Apache-2.0"
+homepage = "https://crates.io"
+repository = "https://github.com/rust-lang/cargo"
+documentation = "https://docs.rs/cargo"
+readme = "README.md"
+description = """
+Cargo, a package manager for Rust.
+"""
+
+[lib]
+name = "cargo"
+path = "src/cargo/lib.rs"
+
+[dependencies]
+atty = "0.2"
+bytesize = "1.0"
+cargo-platform = { path = "crates/cargo-platform", version = "0.1.1" }
+cargo-util = { path = "crates/cargo-util", version = "0.1.0" }
+crates-io = { path = "crates/crates-io", version = "0.33.0" }
+crossbeam-utils = "0.8"
+curl = { version = "0.4.23", features = ["http2"] }
+curl-sys = "0.4.22"
+env_logger = "0.8.1"
+pretty_env_logger = { version = "0.4", optional = true }
+anyhow = "1.0"
+filetime = "0.2.9"
+flate2 = { version = "1.0.3", default-features = false, features = ["zlib"] }
+git2 = "0.13.16"
+git2-curl = "0.14.1"
+glob = "0.3.0"
+hex = "0.4"
+home = "0.5"
+humantime = "2.0.0"
+ignore = "0.4.7"
+lazy_static = "1.2.0"
+jobserver = "0.1.21"
+lazycell = "1.2.0"
+libc = "0.2"
+log = "0.4.6"
+libgit2-sys = "0.12.18"
+memchr = "2.1.3"
+num_cpus = "1.0"
+opener = "0.4"
+percent-encoding = "2.0"
+rustfix = "0.5.0"
+semver = { version = "0.10", features = ["serde"] }
+serde = { version = "1.0.123", features = ["derive"] }
+serde_ignored = "0.1.0"
+serde_json = { version = "1.0.30", features = ["raw_value"] }
+shell-escape = "0.1.4"
+strip-ansi-escapes = "0.1.0"
+tar = { version = "0.4.26", default-features = false }
+tempfile = "3.0"
+termcolor = "1.1"
+toml = "0.5.7"
+unicode-xid = "0.2.0"
+url = "2.0"
+walkdir = "2.2"
+clap = "2.31.2"
+unicode-width = "0.1.5"
+openssl = { version = '0.10.48', optional = true }
+im-rc = "15.0.0"
+
+# A noop dependency that changes in the Rust repository, it's a bit of a hack.
+# See the `src/tools/rustc-workspace-hack/README.md` file in `rust-lang/rust`
+# for more information.
+rustc-workspace-hack = "1.0.0"
+rand = "0.8.3"
+
+[target.'cfg(windows)'.dependencies]
+fwdansi = "1.1.0"
+
+[target.'cfg(windows)'.dependencies.winapi]
+version = "0.3"
+features = [
+  "basetsd",
+  "handleapi",
+  "jobapi",
+  "jobapi2",
+  "memoryapi",
+  "minwindef",
+  "ntdef",
+  "ntstatus",
+  "processenv",
+  "processthreadsapi",
+  "psapi",
+  "synchapi",
+  "winerror",
+  "winbase",
+  "wincon",
+  "winnt",
+]
+
+[dev-dependencies]
+cargo-test-macro = { path = "crates/cargo-test-macro" }
+cargo-test-support = { path = "crates/cargo-test-support" }
+
+[build-dependencies]
+flate2 = { version = "1.0.3", default-features = false, features = ["zlib"] }
+tar = { version = "0.4.26", default-features = false }
+
+[[bin]]
+name = "cargo"
+test = false
+doc = false
+
+[features]
+deny-warnings = []
+vendored-openssl = ["openssl/vendored"]
+pretty-env-logger = ["pretty_env_logger"]