Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix rust-src component. #74578

Merged
merged 1 commit into from
Jul 22, 2020
Merged

Fix rust-src component. #74578

merged 1 commit into from
Jul 22, 2020

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Jul 21, 2020

The rust-src component could not be installed by rustup because it included some symbolic links. #74520 added the backtrace directory which included some symlinks. Since the rust-src component doesn't need most of the files in the backtrace submodule, this changes it to only include the minimum necessary.

Tested with cargo's build-std that it can build from the resulting tarball.

Fixes #74577

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 21, 2020
@ehuss
Copy link
Contributor Author

ehuss commented Jul 21, 2020

As a followup PR I'd like to look at somehow adding a check so that this particular issue (symlinks) doesn't happen again in the future. I'm not sure where the best place would be to check for that. Maybe in fabricate? Any suggestions?

As for the bigger issue where "rust-src" isn't usable, do you think it is feasible to add a test for that? I'd be reluctant because I can't think of a really stable way to check that. I'm not sure I'd want to gate rust-lang/rust on cargo's build-std feature right now. Maybe there is some other check that would be reasonable? If not, we can probably continue without; it doesn't break too often.

@rbtcollins
Copy link
Contributor

So generally speaking symlinks can't be used on windows without toggling on 'developer mode' - it would be nice to actually remove the symlinks from the tree entirely IMO, though I recognise that that is a larger change.

@Mark-Simulacrum
Copy link
Member

@bors r+ p=1

Approving, though I agree this seems like a suboptimal fix in the long run. I think we should consider automatically "delinking" any symlinks we find or something like that.

@bors
Copy link
Contributor

bors commented Jul 21, 2020

📌 Commit 79673d3 has been approved by Mark-Simulacrum

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 21, 2020
@bors
Copy link
Contributor

bors commented Jul 21, 2020

⌛ Testing commit 79673d3 with merge 0b66800a2cfb407c917a83451238298ac22b5245...

@bors
Copy link
Contributor

bors commented Jul 21, 2020

💔 Test failed - checks-azure

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 21, 2020
@ehuss
Copy link
Contributor Author

ehuss commented Jul 21, 2020

@bors retry

##[error]The request: 368240 was abandoned due to an infrastructure failure. Notification of assignment to an agent was never received.

macOS x86_64-apple on azure

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 21, 2020
@bors
Copy link
Contributor

bors commented Jul 21, 2020

⌛ Testing commit 79673d3 with merge be0c64997c1881943ccfd2220eeef831d12be12e...

@bors
Copy link
Contributor

bors commented Jul 21, 2020

💥 Test timed out

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 21, 2020
@ehuss
Copy link
Contributor Author

ehuss commented Jul 21, 2020

@bors retry
Looks like both azure and gha succeeded, but bors didn't get the memo.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 21, 2020
@bors
Copy link
Contributor

bors commented Jul 22, 2020

⌛ Testing commit 79673d3 with merge 4825e12...

@conikeec
Copy link

Any update on this PR ? I filed rust-lang/rustup#2434 which in turn is blocked on this. All updates are failing at this point.

@bors
Copy link
Contributor

bors commented Jul 22, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: Mark-Simulacrum
Pushing 4825e12 to master...

@RalfJung
Copy link
Member

As for the bigger issue where "rust-src" isn't usable, do you think it is feasible to add a test for that? I'd be reluctant because I can't think of a really stable way to check that. I'm not sure I'd want to gate rust-lang/rust on cargo's build-std feature right now. Maybe there is some other check that would be reasonable? If not, we can probably continue without; it doesn't break too often.

x.py test src/tools/miri already uses xargo to build a libstd for Miri. If we could somehow make it use the rust-src component instead of the actual rust source tree, that would provide some pretty good coverage.

@mati865
Copy link
Contributor

mati865 commented Jul 22, 2020

x.py test src/tools/miri already uses xargo to build a libstd for Miri. If we could somehow make it use the rust-src component instead of the actual rust source tree, that would provide some pretty good coverage.

If Miri tests don't take too long maybe they could be moved to new builder that starts right when Linux dist finishes. It would install Rust (with proper components) from AWS and then run Miri tests. Don't know if it's possible/feasible though.

@cuviper cuviper added this to the 1.47.0 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

cannot install rust-src component for nightly-2020-07-21
9 participants