diff options
| author | bors <bors@rust-lang.org> | 2020-08-18 12:29:50 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-08-18 12:29:50 +0000 |
| commit | 2c3dc04ea4071805fbd1b07bd726c1daf03c0384 (patch) | |
| tree | c7540fab15ec3df2c9531443cff7afd91b310bb6 | |
| parent | 01ffbcbeed39b71c9939c7e67e39e59a5a09b254 (diff) | |
| parent | e23f68a3d0fafbf8cdeb9fbc64f7376f6358d859 (diff) | |
Auto merge of #75663 - Xanewok:update-rls, r=Mark-Simulacrum
Use git for Rustfmt dependency of RLS Closes #75442 r? @Mark-Simulacrum cc @calebcartwright for changed rustfmt dep kind
| -rw-r--r-- | Cargo.toml | 3 | ||||
| m--------- | src/tools/rls | 0 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Cargo.toml b/Cargo.toml index 87e958a1baf..d8d9cc399c8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -77,12 +77,13 @@ object.debug = 0 [patch."https://github.com/rust-lang/cargo"] cargo = { path = "src/tools/cargo" } -[patch.crates-io] +[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 rustc-workspace-hack = { path = 'src/tools/rustc-workspace-hack' } diff --git a/src/tools/rls b/src/tools/rls -Subproject 942aa2b5d729a63f8b81592ab7b2720b63a884e +Subproject 48ef96dd00b90d950a122ca180923aba77efaf7 |