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

Rollup of 2 pull requests #74544

Closed
wants to merge 2 commits into from

Conversation

Manishearth
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

alexcrichton and others added 2 commits July 19, 2020 17:30
This should hopefully handle rust-lang#74484 but in any case fixes compilation of
the standard library without the `backtrace` feature. The need for this
feature is somewhat unclear now because the `backtrace` crate should
always compile (no more C code!) but we can handle that later if
necessary.
…rk-Simulacrum

std: Fix compilation without backtrace feature

This should hopefully handle rust-lang#74484 but in any case fixes compilation of
the standard library without the `backtrace` feature. The need for this
feature is somewhat unclear now because the `backtrace` crate should
always compile (no more C code!) but we can handle that later if
necessary.
@Manishearth
Copy link
Member Author

@rustbot modify labels: +rollup
@bors r+ rollup=never p=5 treeclosed-

@bors
Copy link
Contributor

bors commented Jul 20, 2020

📌 Commit 274131d has been approved by Manishearth

@bors
Copy link
Contributor

bors commented Jul 20, 2020

🌲 The tree is currently closed for pull requests below priority 6, this pull request will be tested once the tree is reopened

@rustbot rustbot added the rollup A PR which is a rollup label Jul 20, 2020
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 20, 2020
@bors
Copy link
Contributor

bors commented Jul 20, 2020

⌛ Testing commit 274131d with merge d20d8e62088148eecdaaaefc853728107d6c152b...

@Manishearth
Copy link
Member Author

The second PR had merged already, there was just a race condition with homu. There's only one PR in the queue, just let it land.

@rust-log-analyzer
Copy link
Collaborator

Your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @rust-lang/infra. (Feature Requests)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup 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.

5 participants