chore: repair Cargo.lock and unbreak the MSRV job - #23
Merged
Conversation
The merge of v/0.23.43 resolved Cargo.lock by keeping stale entries from impit-main, leaving icu_normalizer 2.1.1 pinned against zerovec 0.11.5 which its manifest no longer accepts. Every job that resolves the workspace failed. Adopt upstream's lockfile, which our manifests already satisfy.
The `impit` feature enables `zlib`, so `all-features-except zlib` silently re-enabled it and the 1.71 check failed on zlib-rs, whose MSRV is 1.75. The subsequent 1.75 `--all-features` step still covers `impit`.
The merge of upstream v/0.23.43 added `ClientConfig::send_ticket_request`
and updated the default builder to initialize it, but the parallel
`ClientConfig` initializer guarded by `#[cfg(feature = "impit")]` was not
updated, so building with the `impit` feature fails:
error[E0063]: missing field `send_ticket_request` in initializer of
`ClientConfig` --> rustls/src/client/builder.rs:309
Defaults to `None`, matching both the field's documented default and the
non-impit builder a few lines above, so no ticket_request extension is
sent and emulated ClientHellos are unchanged.
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
3 participants
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.
Three independent breakages that the merge of
v/0.23.43intoimpit-main(ea08c88) left behind, all of which make CI red on every PR opened against the branch.The merge resolved
Cargo.lockby keeping stale entries from our side, which lefticu_normalizer 2.1.1locked againstzerovec 0.11.5— a combination its manifest no longer permits. Cargo refuses to resolve the workspace at all, so most jobs die withfailed to select a version for zerovecbefore running anything. Our manifests differ from upstream only in theaws-lc-rsfloor and the addedimpitfeature, both of which upstream's lockfile already satisfies, so this adopts upstream'sCargo.lockverbatim.The merge also added
ClientConfig::send_ticket_requestand initialized it in the default builder, but not in the parallel initializer behind#[cfg(feature = "impit")], so anything building withimpitfails with E0063. Fix cherry-picked from @jackc625's work in #22 so the base branch carries it.Finally, the MSRV job's first step excludes
zlibbecause zlib-rs needs rustc 1.75, butimpit = ["aws_lc_rs", "ring", "brotli", "zlib"]silently re-enables it —admin/all-features-exceptdocuments that it assumes, without verifying, that the remaining features don't depend on the excluded ones.impitis now excluded there too; the job's second step still covers it via--all-featuresat 1.75.