removing freebsd 11 EOL proposal. #3139
Conversation
|
r? @JohnTitor (rustbot has picked a reviewer for you, use r? to override) |
|
Note that there're some overrides with #2406. |
|
☔ The latest upstream changes (presumably #3037) made this pull request unmergeable. Please resolve the merge conflicts. |
devnexen
force-pushed
the
remove_fbsd11_support
branch
from
e30b5ac to
f01623a
Compare
|
☔ The latest upstream changes (presumably #2999) made this pull request unmergeable. Please resolve the merge conflicts. |
@devnexen Please resolve the merge conflict. |
devnexen
force-pushed
the
remove_fbsd11_support
branch
from
f01623a to
9e7d63b
Compare
build.rs
Outdated
| Some(13) if libc_ci => set_cfg("freebsd13"), | ||
| Some(14) if libc_ci => set_cfg("freebsd14"), | ||
| Some(_) | None => set_cfg("freebsd11"), | ||
| Some(12) if libc_ci => println!("cargo:rustc-cfg=freebsd12"), |
There was a problem hiding this comment.
This looks like a merge conflict. You should use set_cfg instead of println!
| // APIs that were changed after FreeBSD 11 | ||
|
|
||
| // The type of `nlink_t` changed from `u16` to `u64` in FreeBSD 12: | ||
| pub type nlink_t = u16; |
There was a problem hiding this comment.
All of the stuff that was in this file should now be moved into freebsdlike/freebsd/mod.rs For example, move all three nlink_t definitions from freebsd{12,13,14}.rs into that file.
devnexen
force-pushed
the
remove_fbsd11_support
branch
3 times, most recently
from
ce5b55f to
72de88e
Compare
|
I started a conversation on Zulip to see how people feel about this. |
|
This is basically 100% conflicted, but @devnexen would you be up for rebasing this? EOL was 5 years ago so I can't imagine anyone would object at this point. |
devnexen
force-pushed
the
remove_fbsd11_support
branch
from
72de88e to
e3d1192
Compare
devnexen
force-pushed
the
remove_fbsd11_support
branch
2 times, most recently
from
3fe771e to
662e1b4
Compare
devnexen
force-pushed
the
remove_fbsd11_support
branch
3 times, most recently
from
1c0de03 to
5eb24f0
Compare
build.rs
Outdated
| @@ -74,8 +72,6 @@ fn main() { | |||
|
|
|||
| match which_freebsd { | |||
| x if x < 10 => panic!("FreeBSD older than 10 is not supported"), | |||
There was a problem hiding this comment.
Could you update this comment?
|
I haven't looked through this in detail yet but the changes look correct. @asomers would you be able to review? |
devnexen
force-pushed
the
remove_fbsd11_support
branch
from
5eb24f0 to
2da0438
Compare
No description provided.