[beta] Attempt to fix the component manifest problem for rls-preview #44352
Conversation
# Conflicts: # src/librustc_mir/build/scope.rs
…Mark-Simulacrum rustbuild: Remove invalid doctest from bootstrap.py
Resync clippy to v0.0.156 None
…-new-fangled-thing, r=aturon expand on using rustup custom toolchains in CONTRIBUTING.md fixes rust-lang#42484 Should i include more notes about how to use a local build *without* rustup? It can kinda feel like a cop-out otherwise. Other means that come to mind are setting `$RUSTC` directly and fully installing it. cc @rust-lang/docs
Compact display of static lib dependencies Fixes rust-lang#33173 Instead of displaying one dependency per line, I've changed the format to display them all in one line. As a bonus they're in format of linker flags (`-lfoo`), so the output can be copy&pasted if one is actually going to link as suggested.
Produce expansion info for more builtin macros r? @jseyfried fixes rust-lang#43268
[MIR] Restrict ProjectionElem::Index and Storage{Live,Dead} to Local.
(see rust-lang#44285)
r? @nikomatsakis
alexcrichton
force-pushed
the
rls-component-manifest
branch
from
1ffc3dd to
0f2a65a
Compare
|
Sounds plausible to me! I've retargeted this PR to the beta branch from the master branch and I've pushed a commit to bump the beta version as well, we can land it on nightly once we've verified that it works on beta. @bors: r+ |
|
📌 Commit 7a1fad8 has been approved by |
alexcrichton
changed the title
|
@bors: p=1 I also realize that I don't think we've ever changed the base branch of a PR before, this may cause homu to explode. |
|
🔒 Merge conflict |
|
Hm ok I didn't really expect that to work... @nrc want to close this an reopen a new PR targeted at beta? |
|
I'll make a beta PR. Do we want to merge something to master too? Or will we forward-port the beta patch? |
|
Nah yeah let's do a PR for the master branch here. I think I've probably done enough damage here though by accident you may wish to make a new PR though? Feel free to r=me on a master PR (although give a higher p=10 to a beta PR) |
nrc
force-pushed
the
rls-component-manifest
branch
from
7a1fad8 to
1ffc3dd
Compare
|
New master PR: #44356 |
|
beta PR: #44357 |
cc #44270
r? @alexcrichton
Hypothesis - this change will lead to the installer putting
rls-previewinstead ofrlsin thecomponentsfile in the rls tarball, which will lead to rustup being happy with the component name in the rls package, and prevent theCorruptComponenterror.There is no good way to test this though, as far as I can see?