Fix CI for FreeBSD 15, on libc-0.2 branch #3952
Merged
Conversation
This file contains 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
tgross35
reviewed
Sep 29, 2024
Comment on lines
3846
to
3847
| #[doc(hidden)] | ||
| #[deprecated(since = "0.2.160", note = "Removed in FreeBSD 15")] | ||
| pub const TCP_MAXPEAKRATE: ::c_int = 69; |
There was a problem hiding this comment.
I think it would be better to remove #[doc(hidden)] for now so it doesn't disappear entirely. We can add it back in a couple versions.
There was a problem hiding this comment.
Ok. Though note that the sockopt was never actually implemented within the kernel, so no program that tried to use it could've possibly worked.
|
Could you amend the message to mention 590d78d (commit from #3950 (comment))? The branches are just a bit easier to manage if similar commits are crosslinked somehow, even though this isn't exactly a cherry pick. |
It was failing for two reasons: * 87fbd9fc71[^1] removed the TCP_MAXPEAKRATE symbol. * 3458bbd392[^2] changed the value of RLIM_NLIMITS This is effectively a merge of rust-lang#3950 (commit 590d78d) from the main branch. Fixes rust-lang#3947 [^1]: freebsd/freebsd-src@87fbd9f [^2]: freebsd/freebsd-src@3458bbd
asomers
force-pushed
the
TCP_MAXPEAKRATE-0.2
branch
from
5281edb
to
07104b3
Compare
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.
It was failing for two reasons:
Fixes #3947
Footnotes
https://github.com/freebsd/freebsd-src/commit/87fbd9fc7fc5f8d79fe5e3dcd13ad02b11a67ef0 ↩
https://github.com/freebsd/freebsd-src/commit/3458bbd397783f3bb62713c54ae87f19eeb98dc0 ↩