Skip to content

Commit

Permalink
Rollup merge of rust-lang#94220 - GuillaumeGomez:miniz-oxide-decl, r=…
Browse files Browse the repository at this point in the history
…Amanieu

Correctly handle miniz_oxide extern crate declaration

Fixes rust-lang#94219.

Follow-up of rust-lang#94122.

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

r? `@ivmarkov`
  • Loading branch information
matthiaskrgr authored Feb 21, 2022
2 parents 9157775 + 910d46f commit ed35309
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions library/std/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,7 @@ extern crate unwind;

#[doc(masked)]
#[allow(unused_extern_crates)]
#[cfg(feature = "miniz_oxide")]
extern crate miniz_oxide;

// During testing, this crate is not actually the "real" std library, but rather
Expand Down

0 comments on commit ed35309

Please sign in to comment.