Skip to content

[beta] Attempt to fix the component manifest problem for rls-preview - #44352

Closed
nrc wants to merge 338 commits into
rust-lang:betafrom
nrc:rls-component-manifest
Closed

[beta] Attempt to fix the component manifest problem for rls-preview#44352
nrc wants to merge 338 commits into
rust-lang:betafrom
nrc:rls-component-manifest

Conversation

@nrc

@nrcnrc commented Sep 5, 2017

Copy link
Copy Markdown
Member

cc #44270

r? @alexcrichton

Hypothesis - this change will lead to the installer putting rls-preview instead of rls in the components file in the rls tarball, which will lead to rustup being happy with the component name in the rls package, and prevent the CorruptComponent error.

There is no good way to test this though, as far as I can see?

alexcrichtonand others added 30 commits August 11, 2017 09:55
@alexcrichton
Merge remote-tracking branch 'origin/master' into gen
3971a3d
@alexcrichton
Fix an error in diagnostic codes
84af3d8
@Zoxc
Strip landing pads in the state transformation
fa18aa3
@Zoxc
Merge branch 'master' ofhttps://github.com/rust-lang/rustinto gen
d020ff0
# Conflicts:
#	src/librustc_mir/build/scope.rs
@Zoxc
Fix errors
1787d4e
@alexcrichton
Fix UI test
6eab1ca
@Zoxc
Make generator interior types deterministic
eff2884
@Zoxc
Use a DepNode for the generator signature
b045c20
@alexcrichton
Merge remote-tracking branch 'origin/master' into gen
1413253
@alexcrichton
Choose another error code
22ebcac
@alexcrichton
Fix merge conflicts with gen branch
b6b9690
@Zoxc
Remove fixme
17197c6
@oli-obk
Add clippy as a submodule
1766992
@oli-obk
Document the process of updating external dependencies
49fca85
@oli-obk
Fetch the pull request before checkout
f467776
@oli-obk
Add a Cargo.lock to clippy
b9e4bdb
@oli-obk
Update workflow to git oddities
93a9183
@JeremySorensen
make ignore-git true by default when channel is dev
c3b27d5
@alexcrichton
Merge remote-tracking branch 'origin/master' into gen
1210ebf
@alexcrichton
Fix merge conflict
0697e4b
@alexcrichton
Merge remote-tracking branch 'origin/master' into gen
5f4a99f
@alexcrichton
Fix merge conflicts
63477fd
@mystor
Don't highlight # which does not start an attribute in rustdoc
e83c808
@JeremySorensen
fix typo in git-ignore comment
5e472c2
@JeremySorensen
initialize ignore-git to false
bdb7901
@alexcrichton
Merge remote-tracking branch 'origin/master' into gen
4b5f330
@alexcrichton
Fix UI tests
a47038f
@alexcrichton
Fix more UI tests
9620d26
@alexcrichton
Fix a diagnostic
e70cc27
@Zoxc
Make gathering generator interior types O(n log n)
bf3ebcc
borsand others added 9 commits September 4, 2017 04:30
@bors
Auto merge ofrust-lang#44268- kennytm:fix-python-bootstrap-test, r=…
e22a3cf
…Mark-Simulacrum
rustbuild: Remove invalid doctest from bootstrap.py
@eddyb
rustc_mir: use Local instead of Lvalue in Storage{Live,Dead}.
e74f96e
@bors
Auto merge ofrust-lang#44300- Manishearth:clippyup, r=oli-obk
a36d93d
Resync clippy to v0.0.156
None
@oli-obk
Produce expansion info for more builtin macros
c4d5a1e
@bors
Auto merge ofrust-lang#44194- QuietMisdreavus:hey-how-do-i-use-this…
088216f
…-new-fangled-thing, r=aturon
expand on using rustup custom toolchains in CONTRIBUTING.md
fixesrust-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
@bors
Auto merge ofrust-lang#43067- pornel:libdeps, r=nrc
22d6598
Compact display of static lib dependencies
Fixesrust-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.
@bors
Auto merge ofrust-lang#44248- oli-obk:spans, r=jseyfried
2f681bf
Produce expansion info for more builtin macros
r? @jseyfriedfixesrust-lang#43268
@bors
Auto merge ofrust-lang#44308- eddyb:local-index, r=arielb1
2f1ef9e
[MIR] Restrict ProjectionElem::Index and Storage{Live,Dead} to Local.
(see rust-lang#44285)
r? @nikomatsakis
Nick Cameron
Attempt to fix the component manifest problem for rls-preview
1ffc3dd
cc rust-lang#44270
@alexcrichton
alexcrichton changed the base branch from master to betaSeptember 5, 2017 21:02
@alexcrichton

alexcrichton commented Sep 5, 2017

Copy link
Copy Markdown
Member

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+

@bors

bors commented Sep 5, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 7a1fad8 has been approved by alexcrichton

@alexcrichtonalexcrichton changed the title Attempt to fix the component manifest problem for rls-preview[beta] Attempt to fix the component manifest problem for rls-previewSep 5, 2017
@alexcrichton

alexcrichton commented Sep 5, 2017

Copy link
Copy Markdown
Member

@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.

@bors

bors commented Sep 5, 2017

Copy link
Copy Markdown
Collaborator

🔒 Merge conflict

@alexcrichton

alexcrichton commented Sep 5, 2017

Copy link
Copy Markdown
Member

Hm ok I didn't really expect that to work...

@nrc want to close this an reopen a new PR targeted at beta?

@nrc

nrc commented Sep 5, 2017

Copy link
Copy Markdown
MemberAuthor

I'll make a beta PR. Do we want to merge something to master too? Or will we forward-port the beta patch?

@alexcrichton

alexcrichton commented Sep 5, 2017

Copy link
Copy Markdown
Member

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
nrcforce-pushed the rls-component-manifest branch from 7a1fad8 to 1ffc3ddCompareSeptember 5, 2017 22:08
@nrcnrc closed this Sep 5, 2017
@nrc

nrc commented Sep 5, 2017

Copy link
Copy Markdown
MemberAuthor

New master PR: #44356

@nrcnrc mentioned this pull request Sep 5, 2017
Merged
@nrc

nrc commented Sep 5, 2017

Copy link
Copy Markdown
MemberAuthor

beta PR: #44357

bors added a commit that referenced this pull request Sep 14, 2017
@bors
Auto merge of#44357- nrc:rls-manifest-beta-2, r=alexcrichton
9637179
[beta] Attempt to fix the component manifest problem for rls-preview
cc #44270
see #44352
bors added a commit that referenced this pull request Sep 15, 2017
@bors
Auto merge of#44357- nrc:rls-manifest-beta-2, r=alexcrichton
ea1fd7d
[beta] Attempt to fix the component manifest problem for rls-preview
cc #44270
see #44352
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@alexcrichtonalexcrichton

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

20 participants

@nrc@alexcrichton@bors@Zoxc@oli-obk@JeremySorensen@mystor@kornelski@topecongiro@RalfJung@mattico@daboross@arielb1@vorner@ishitatsuyuki@eddyb@zackmdavis@SergioBenitez@frewsxcv@GuillaumeGomez