Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/remove deprecated DragonFly items #2522

Merged
merged 1 commit into from
Dec 5, 2021
Merged

Fix/remove deprecated DragonFly items #2522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions libc-test/semver/dragonfly.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ Elf64_Word
Elf64_Xword
FILENAME_MAX
FIOASYNC
FIODGNAME
FIODNAME
FIODTYPE
FIOGETLBA
FIOGETOWN
Expand Down Expand Up @@ -1037,7 +1037,6 @@ WNOWAIT
WSTOPPED
WTRAPPED
XUCRED_VERSION
XU_NGROUPS
YESEXPR
YESSTR
_IOFBF
Expand Down
20 changes: 3 additions & 17 deletions src/unix/bsd/freebsdlike/dragonfly/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,6 @@ s! {
pub f_uid_uuid: ::uuid_t,
}

#[deprecated(
since = "0.2.107",
note = "stat.st_blksize is an i64 and stat.st_qspare1 is replaced with \
stat.st_blksize in DragonFly 5.8"
)]
pub struct stat {
pub st_ino: ::ino_t,
pub st_nlink: ::nlink_t,
Expand All @@ -128,11 +123,11 @@ s! {
pub st_ctime_nsec: ::c_long,
pub st_size: ::off_t,
pub st_blocks: i64,
pub st_blksize: u32,
pub __old_st_blksize: u32,
pub st_flags: u32,
pub st_gen: u32,
pub st_lspare: i32,
pub st_qspare1: i64,
pub st_blksize: i64,
pub st_qspare2: i64,
}

Expand Down Expand Up @@ -724,9 +719,6 @@ pub const RLIMIT_POSIXLOCKS: ::c_int = 11;
#[deprecated(since = "0.2.64", note = "Not stable across OS versions")]
pub const RLIM_NLIMITS: ::rlim_t = 12;

#[deprecated(since = "0.2.105", note = "Only exists on FreeBSD, not DragonFly BSD")]
pub const XU_NGROUPS: ::c_int = 16;

pub const Q_GETQUOTA: ::c_int = 0x300;
pub const Q_SETQUOTA: ::c_int = 0x400;

Expand Down Expand Up @@ -888,11 +880,6 @@ pub const EV_EOF: u16 = 0x8000;
pub const EV_SYSFLAGS: u16 = 0xf000;

pub const FIODNAME: ::c_ulong = 0x80106678;
#[deprecated(
since = "0.2.106",
note = "FIODGNAME is not defined on DragonFly BSD. See FIODNAME."
)]
pub const FIODGNAME: ::c_ulong = 0x80106678;

pub const NOTE_TRIGGER: u32 = 0x01000000;
pub const NOTE_FFNOP: u32 = 0x00000000;
Expand Down Expand Up @@ -1375,12 +1362,11 @@ extern "C" {

pub fn aio_waitcomplete(iocbp: *mut *mut aiocb, timeout: *mut ::timespec) -> ::c_int;

#[deprecated(since = "0.2.107", note = "len should be of type size_t")]
pub fn devname_r(
dev: ::dev_t,
mode: ::mode_t,
buf: *mut ::c_char,
len: ::c_int,
len: ::size_t,
) -> *mut ::c_char;

pub fn waitid(
Expand Down
4 changes: 0 additions & 4 deletions src/unix/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,7 +699,6 @@ extern "C" {
all(target_os = "freebsd", any(freebsd11, freebsd10)),
link_name = "fstat@FBSD_1.0"
)]
#[cfg_attr(target_os = "dragonfly", allow(deprecated))]
pub fn fstat(fildes: ::c_int, buf: *mut stat) -> ::c_int;

pub fn mkdir(path: *const c_char, mode: mode_t) -> ::c_int;
Expand All @@ -713,7 +712,6 @@ extern "C" {
all(target_os = "freebsd", any(freebsd11, freebsd10)),
link_name = "stat@FBSD_1.0"
)]
#[cfg_attr(target_os = "dragonfly", allow(deprecated))]
pub fn stat(path: *const c_char, buf: *mut stat) -> ::c_int;

pub fn pclose(stream: *mut ::FILE) -> ::c_int;
Expand Down Expand Up @@ -798,7 +796,6 @@ extern "C" {
all(target_os = "freebsd", any(freebsd11, freebsd10)),
link_name = "fstatat@FBSD_1.1"
)]
#[cfg_attr(target_os = "dragonfly", allow(deprecated))]
pub fn fstatat(
dirfd: ::c_int,
pathname: *const ::c_char,
Expand Down Expand Up @@ -990,7 +987,6 @@ extern "C" {
all(target_os = "freebsd", any(freebsd11, freebsd10)),
link_name = "lstat@FBSD_1.0"
)]
#[cfg_attr(target_os = "dragonfly", allow(deprecated))]
pub fn lstat(path: *const c_char, buf: *mut stat) -> ::c_int;

#[cfg_attr(
Expand Down