Update flate2 users to use zlib-rs#154617
Merged
rust-bors[bot] merged 5 commits intorust-lang:mainfrom Mar 31, 2026
Merged
Conversation
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
Member
|
I think there's at least one more dependency from citool which would be good to handle while we're at it. r=me with that done. |
Member
Author
|
@Mark-Simulacrum citool doesn't depend on flate2 directly, only indirectly through ureq. I could temporarily add a flate2 dependency solely to set the feature flag, though. |
Collaborator
|
The list of allowed third-party dependencies may have been modified! You must ensure that any new dependencies have compatible licenses before merging. These commits modify the If this was unintentional then you should revert the changes before this PR is merged. |
Member
Author
|
@bors r=Mark-Simulacrum |
Contributor
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Mar 31, 2026
…k-Simulacrum Update flate2 users to use zlib-rs flate2 is looking to make zlib-rs the default. Go ahead and make build-manifest and rust-installer use it, to make sure it doesn't introduce any issues.
This was referenced Mar 31, 2026
rust-bors bot
pushed a commit
that referenced
this pull request
Mar 31, 2026
…uwer Rollup of 12 pull requests Successful merges: - #154419 (Take first task group for further execution) - #154569 (Fix type alias where clause suggestion spacing issue) - #154617 (Update flate2 users to use zlib-rs) - #154618 (Fix AtomicPtr::update's cfg gate) - #154620 (stabilize new Range type and iterator) - #151932 (refactor: remove `Adjust::ReborrowPin`) - #153980 (refactor: move doc(rust_logo) check to parser) - #154134 (fix: guard paren-sugar pretty-printing on short trait args) - #154270 (Create `Ty` type alias in `rustc_type_ir`) - #154580 (Split AttributeParserError Diagnostic implementation into subfunctions) - #154606 (misc test cleanups) - #154612 (Add a test for a now fixed ICE with `offset_of!()`)
rust-timer
added a commit
that referenced
this pull request
Mar 31, 2026
Rollup merge of #154617 - joshtriplett:flate2-zlib-rs, r=Mark-Simulacrum Update flate2 users to use zlib-rs flate2 is looking to make zlib-rs the default. Go ahead and make build-manifest and rust-installer use it, to make sure it doesn't introduce any issues.
github-actions bot
pushed a commit
to rust-lang/compiler-builtins
that referenced
this pull request
Mar 31, 2026
…uwer Rollup of 12 pull requests Successful merges: - rust-lang/rust#154419 (Take first task group for further execution) - rust-lang/rust#154569 (Fix type alias where clause suggestion spacing issue) - rust-lang/rust#154617 (Update flate2 users to use zlib-rs) - rust-lang/rust#154618 (Fix AtomicPtr::update's cfg gate) - rust-lang/rust#154620 (stabilize new Range type and iterator) - rust-lang/rust#151932 (refactor: remove `Adjust::ReborrowPin`) - rust-lang/rust#153980 (refactor: move doc(rust_logo) check to parser) - rust-lang/rust#154134 (fix: guard paren-sugar pretty-printing on short trait args) - rust-lang/rust#154270 (Create `Ty` type alias in `rustc_type_ir`) - rust-lang/rust#154580 (Split AttributeParserError Diagnostic implementation into subfunctions) - rust-lang/rust#154606 (misc test cleanups) - rust-lang/rust#154612 (Add a test for a now fixed ICE with `offset_of!()`)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
flate2 is looking to make zlib-rs the default.
Go ahead and make build-manifest and rust-installer use it, to make sure it
doesn't introduce any issues.