Skip to content

Update flate2 users to use zlib-rs#154617

Merged
rust-bors[bot] merged 5 commits intorust-lang:mainfrom
joshtriplett:flate2-zlib-rs
Mar 31, 2026
Merged

Update flate2 users to use zlib-rs#154617
rust-bors[bot] merged 5 commits intorust-lang:mainfrom
joshtriplett:flate2-zlib-rs

Conversation

@joshtriplett
Copy link
Copy Markdown
Member

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.

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Mar 31, 2026
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rustbot rustbot added the A-tidy Area: The tidy tool label Mar 31, 2026
@Mark-Simulacrum
Copy link
Copy Markdown
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.

@Mark-Simulacrum Mark-Simulacrum self-requested a review March 31, 2026 02:07
@Mark-Simulacrum Mark-Simulacrum self-assigned this Mar 31, 2026
@joshtriplett
Copy link
Copy Markdown
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.

@rustbot rustbot added A-CI Area: Our Github Actions CI A-testsuite Area: The testsuite used to check the correctness of rustc T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Mar 31, 2026
@joshtriplett joshtriplett marked this pull request as ready for review March 31, 2026 04:11
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Mar 31, 2026

The list of allowed third-party dependencies may have been modified! You must ensure that any new dependencies have compatible licenses before merging.

cc @davidtwco, @wesleywiser

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 31, 2026
@joshtriplett
Copy link
Copy Markdown
Member Author

@bors r=Mark-Simulacrum

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Mar 31, 2026

📌 Commit dd1d5b7 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@rust-bors rust-bors bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 31, 2026
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.
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-bors rust-bors bot merged commit c91d040 into rust-lang:main Mar 31, 2026
11 checks passed
@rustbot rustbot added this to the 1.96.0 milestone Mar 31, 2026
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!()`)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-CI Area: Our Github Actions CI A-testsuite Area: The testsuite used to check the correctness of rustc A-tidy Area: The tidy tool S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants