X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=Cargo.toml;h=5753730053f4cb6b29827584397faa7cf8919c2f;hb=3de558dd2dab1726cd008baee350bec6bca83b4b;hp=ffc886d47f3991536d16396654ac59c16902571c;hpb=56ba13ac7f89b6ac8d70ec28230498dfa0790b93;p=rust.git diff --git a/Cargo.toml b/Cargo.toml index ffc886d47f3..5753730053f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,6 +35,7 @@ members = [ "src/tools/jsondocck", "src/tools/html-checker", "src/tools/bump-stage0", + "src/tools/replace-version-placeholder", "src/tools/lld-wrapper", ] @@ -96,21 +97,6 @@ gimli.debug = 0 miniz_oxide.debug = 0 object.debug = 0 -# We want the RLS to use the version of Cargo that we've got vendored in this -# repository to ensure that the same exact version of Cargo is used by both the -# RLS and the Cargo binary itself. The RLS depends on Cargo as a git repository -# so we use a `[patch]` here to override the github repository with our local -# vendored copy. -[patch."https://github.com/rust-lang/cargo"] -cargo = { path = "src/tools/cargo" } -cargo-util = { path = "src/tools/cargo/crates/cargo-util" } - -[patch."https://github.com/rust-lang/rustfmt"] -# Similar to Cargo above we want the RLS to use a vendored version of `rustfmt` -# that we're shipping as well (to ensure that the rustfmt in RLS and the -# `rustfmt` executable are the same exact version). -rustfmt-nightly = { path = "src/tools/rustfmt" } - [patch.crates-io] # See comments in `src/tools/rustc-workspace-hack/README.md` for what's going on # here