Skip to content

Conversation

Mark-Simulacrum
Copy link
Member

It is needed by cargo-c, it was removed in df5cb70

This is coupled with stable backport approved yesterday, #8527.

It is needed by cargo-c, it was removed in df5cb70
@rust-highfive
Copy link

r? @ehuss

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive
Copy link

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against rust-1.46.0. Please double check that you specified the right target!

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

Mind cherry-picking #8528 here to get green CI?

Copy link
Contributor

@ehuss ehuss left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would be fine to manually merge this. The beta branch would need a fair bit of work to get CI passing (at least #8528 and #8467, I'm not sure what the cfg_if failure is about).

@Mark-Simulacrum
Copy link
Member Author

Happy with whatever, just let me know. Do we expect these test failures to lead to problems when integrating into upstream (rust-lang/rust)?

@alexcrichton
Copy link
Member

Ah that's a good point, I think it's fine to just hit merge. I'll work on getting a green CI later for more backports.

@alexcrichton
Copy link
Member

Oh and these are all nightly-only tests so shouldn't cause issues in rust-lang/rust.

@alexcrichton alexcrichton merged commit 43e50fb into rust-lang:rust-1.46.0 Jul 23, 2020
@ehuss
Copy link
Contributor

ehuss commented Jul 23, 2020

Oh, haha, sorry for giving conflicting advice! These won't fail in rust-lang/rust because they don't run there (all of our nightly-only tests are disabled on rust-lang/rust).

@ehuss ehuss added this to the 1.46.0 milestone Feb 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants