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

Correctly handle miniz_oxide extern crate declaration #94220

Merged
merged 1 commit into from
Feb 22, 2022

Conversation

GuillaumeGomez
Copy link
Member

@GuillaumeGomez GuillaumeGomez commented Feb 21, 2022

Fixes #94219.

Follow-up of #94122.

The miniz_oxide dependency is optional and therefore should allow be "imported" when it makes sense.

r? @ivmarkov

Copy link
Contributor

@ivmarkov ivmarkov left a comment

Choose a reason for hiding this comment

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

Works great, thanks!

@GuillaumeGomez
Copy link
Member Author

r? @Amanieu

@Amanieu
Copy link
Member

Amanieu commented Feb 21, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Feb 21, 2022

📌 Commit 910d46f has been approved by Amanieu

@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 Feb 21, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 21, 2022
…askrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#91192 (Some improvements to the async docs)
 - rust-lang#94143 (rustc_const_eval: adopt let else in more places)
 - rust-lang#94156 (Gracefully handle non-UTF-8 string slices when pretty printing)
 - rust-lang#94186 (Update pin_static_ref stabilization version.)
 - rust-lang#94189 (Implement LowerHex on Scalar to clean up their display in rustdoc)
 - rust-lang#94190 (Use Metadata::modified instead of FileTime::from_last_modification_ti…)
 - rust-lang#94203 (CTFE engine: Scalar: expose size-generic to_(u)int methods)
 - rust-lang#94211 (Better error if the user tries to do assignment ... else)
 - rust-lang#94215 (trait system: comments and small nonfunctional changes)
 - rust-lang#94220 (Correctly handle miniz_oxide extern crate declaration)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit ed35309 into rust-lang:master Feb 22, 2022
@rustbot rustbot added this to the 1.61.0 milestone Feb 22, 2022
@GuillaumeGomez GuillaumeGomez deleted the miniz-oxide-decl branch February 22, 2022 09:31
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.

PR #94122 Broke cargo -Z build-std
5 participants