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

include backtrace folder in rust-src component #74520

Merged
merged 1 commit into from
Jul 20, 2020

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Jul 19, 2020

libstd has a mandatory dependency on this code, ergo we need to include it in rust-src.

r? @oli-obk
Fixes #74506

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 19, 2020
@Mark-Simulacrum
Copy link
Member

@bors r+ p=1

This broke perf (though I fixed that without that, rust-lang/rustc-perf#693) but I suspect it'll break rust-analyzer and other similar tooling. We should maybe think about checking that rust-src can build std or something along those lines in CI.

@bors
Copy link
Contributor

bors commented Jul 19, 2020

📌 Commit d7a36d8 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 19, 2020
@Mark-Simulacrum
Copy link
Member

@bors rollup

@alexcrichton
Copy link
Member

Sorry for the breakage!

@bors
Copy link
Contributor

bors commented Jul 19, 2020

⌛ Testing commit d7a36d8 with merge decd538723a45cd490ece6b8bf040ef1d546e6b0...

@bors
Copy link
Contributor

bors commented Jul 19, 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 19, 2020
@ehuss
Copy link
Contributor

ehuss commented Jul 19, 2020

@bors retry p=5

Cargo's CI is also broken.

    Updating crates.io index
error: failed to get `cc` as a dependency of package `bootstrap v0.0.0 (D:\a\1\s\src\bootstrap)`

Caused by:
  failed to fetch `https://github.com/rust-lang/crates.io-index`

Caused by:
  error inflating zlib stream; class=Zlib (5)

@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 19, 2020
@bors
Copy link
Contributor

bors commented Jul 19, 2020

⌛ Testing commit d7a36d8 with merge 157907fef84eafe3d595b9d3f4e7ec20b5e17854...

@bors
Copy link
Contributor

bors commented Jul 19, 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 19, 2020
@Mark-Simulacrum
Copy link
Member

That... is an unexpected failure! I guess it's presumably spurious, though, since this PR isn't touching anything related.

@bors retry backtrace-debuginfo test trace does not match position list

@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 19, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 20, 2020
…arth

Rollup of 9 pull requests

Successful merges:

 - rust-lang#73618 (Documentation for the false keyword)
 - rust-lang#74486 (Improve Read::read_exact documentation)
 - rust-lang#74514 (Do not clobber RUSTDOCFLAGS)
 - rust-lang#74516 (do not try fetching the ancestors of errored trait impls)
 - rust-lang#74520 (include backtrace folder in rust-src component)
 - rust-lang#74523 (Improve documentation for `core::fmt` internals)
 - rust-lang#74527 (Add myself to toolstate change notifications for rustfmt)
 - rust-lang#74534 (Only skip impls of foreign unstable traits)
 - rust-lang#74536 (fix documentation surrounding the `in` and `for` keywords)

Failed merges:

r? @ghost
@bors bors merged commit 42f6ed4 into rust-lang:master Jul 20, 2020
@RalfJung RalfJung deleted the backtrace-src branch July 20, 2020 12:37
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 22, 2020
Fix rust-src component.

The rust-src component could not be installed by rustup because it included some symbolic links. rust-lang#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 rust-lang#74577
@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
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.

rust-src component is not self-contained anymore
8 participants