Skip to content

Commit

Permalink
Auto merge of #75663 - Xanewok:update-rls, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
Use git for Rustfmt dependency of RLS

Closes #75442

r? @Mark-Simulacrum

cc @calebcartwright for changed rustfmt dep kind
  • Loading branch information
bors committed Aug 18, 2020
2 parents 01ffbcb + e23f68a commit 2c3dc04
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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' }
Expand Down
2 changes: 1 addition & 1 deletion src/tools/rls
Submodule rls updated 1 files
+1 −4 Cargo.toml

0 comments on commit 2c3dc04

Please sign in to comment.