diff --git a/Cargo.lock b/Cargo.lock index 5d05a09f03893..e9f680c9eee83 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2551,18 +2551,30 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.38" +version = "0.10.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95" +checksum = "518915b97df115dd36109bfa429a48b8f737bd05508cf9588977b599648926d2" dependencies = [ "bitflags", "cfg-if 1.0.0", "foreign-types", "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.5" @@ -2580,9 +2592,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.72" +version = "0.9.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb" +checksum = "666416d899cf077260dac8698d60a60b435a46d57e82acb1be3d0dad87284e5b" dependencies = [ "autocfg", "cc", diff --git a/src/tools/cargo b/src/tools/cargo deleted file mode 160000 index 70898e522116f..0000000000000 --- a/src/tools/cargo +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 70898e522116f6c23971e2a554b2dc85fd4c84cd diff --git a/src/tools/cargo/Cargo.toml b/src/tools/cargo/Cargo.toml new file mode 100644 index 0000000000000..85e83a8a1cdec --- /dev/null +++ b/src/tools/cargo/Cargo.toml @@ -0,0 +1,120 @@ +[package] +name = "cargo" +version = "0.68.0" +edition = "2021" +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] +bytesize = "1.0" +cargo-platform = { path = "crates/cargo-platform", version = "0.1.2" } +cargo-util = { path = "crates/cargo-util", version = "0.2.3" } +crates-io = { path = "crates/crates-io", version = "0.35.0" } +curl = { version = "0.4.44", features = ["http2"] } +curl-sys = "0.4.59" +env_logger = "0.10.0" +pretty_env_logger = { version = "0.4", optional = true } +anyhow = "1.0.47" +filetime = "0.2.9" +flate2 = { version = "1.0.3", default-features = false, features = ["zlib"] } +git2 = "0.15.0" +git2-curl = "0.16.0" +glob = "0.3.0" +hex = "0.4" +home = "0.5" +http-auth = { version = "0.1.6", default-features = false } +humantime = "2.0.0" +indexmap = "1" +ignore = "0.4.7" +is-terminal = "0.4.0" +lazy_static = "1.2.0" +jobserver = "0.1.24" +lazycell = "1.2.0" +libc = "0.2" +log = "0.4.6" +libgit2-sys = "0.14.0" +memchr = "2.1.3" +opener = "0.5" +os_info = "3.5.0" +pathdiff = "0.2" +percent-encoding = "2.0" +rustfix = "0.6.0" +semver = { version = "1.0.3", features = ["serde"] } +serde = { version = "1.0.123", features = ["derive"] } +serde_ignored = "0.1.0" +serde_json = { version = "1.0.30", features = ["raw_value"] } +serde-value = "0.7.0" +shell-escape = "0.1.4" +strip-ansi-escapes = "0.1.0" +tar = { version = "0.4.38", default-features = false } +tempfile = "3.0" +termcolor = "1.1" +toml_edit = { version = "0.15.0", features = ["serde", "easy", "perf"] } +unicode-xid = "0.2.0" +url = "2.2.2" +walkdir = "2.2" +clap = "4.0.15" +unicode-width = "0.1.5" +openssl = { version = '0.10.48', optional = true } +im-rc = "15.0.0" +itertools = "0.10.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" + +[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" } +same-file = "1.0.6" +snapbox = { version = "0.4.0", features = ["diff", "path"] } + +[build-dependencies] +flate2 = { version = "1.0.3", default-features = false, features = ["zlib"] } +tar = { version = "0.4.38", default-features = false } + +[[bin]] +name = "cargo" +test = false +doc = false + +[features] +deny-warnings = [] +vendored-openssl = ["openssl/vendored"] +vendored-libgit2 = ["libgit2-sys/vendored"] +pretty-env-logger = ["pretty_env_logger"]