-
Notifications
You must be signed in to change notification settings - Fork 13.4k
Rls and Rustfmt stuff #44769
New issue
Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? # to your account
Rls and Rustfmt stuff #44769
Conversation
src/bootstrap/dist.rs
Outdated
work.join(&format!("{}-{}", pkgname(build, "rls"), target)).join("rls-preview") | ||
}; | ||
cp_r(&rls_path, &exe.join("rls")); | ||
cp_r(&work.join(&format!("{}-{}", pkgname(build, "rls"), target)).join("rls"), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this be .join("rls-preview")
? (to stay the same as non-nightly)
Looks good! Just one minor comment I do think, though, that the Fixing this I think will require some rather invasive changes. I started this locally a few days ago but haven't had a chance to finish it :(. The hardest part is going to be modifying the combined installers, notably the pkg/exe/msi installers as their built-in manifests are going to change based on whether the RLS is available or not. That all being said, I think this is fine to land in the meantime. We'll need to keep the rls/rustfmt building to actually land any changes, but that's just the status quo. |
Comment addressed. Hmm, yeah, keeping the installers going is going to be a bit tricky. |
@bors: r+ |
📌 Commit 26d6a2f has been approved by |
Maybe from |
⌛ Testing commit 26d6a2f9bc97d43f0d5bd2ba98d1431e23bf670a with merge 7a0f64bdae8cb274a9ba91d20615a912563dcf87... |
💔 Test failed - status-travis |
Same error on Homu, but probably due to #44785 (comment) |
travis is still failing :( |
☔ The latest upstream changes (presumably #44709) made this pull request unmergeable. Please resolve the merge conflicts. |
I've folded this into #44785 |
Updates the RLS and Rustfmt, uses the toolstate stuff for allowing disabling rls and rustfmt, and renames the rls component to rls-preview on nightly.
r? @alexcrichton