diff options
author | bors <bors@rust-lang.org> | 2019-09-07 09:38:10 +0000 |
---|---|---|
committer | bors <bors@rust-lang.org> | 2019-09-07 09:38:10 +0000 |
commit | f7de365d3b2a54c0d4a4dd7fcc64137edb230959 (patch) | |
tree | f6a35d9539174ea9f851666df0c115de65daf907 | |
parent | e61ec827bf1ac0c70033df9820f76ff02764062b (diff) | |
parent | ac1e12409ef18d46240f48e432026951ff02e4a6 (diff) | |
download | rust-libc-f7de365d3b2a54c0d4a4dd7fcc64137edb230959.tar.gz |
Auto merge of #1497 - asomers:rlim_nlimits, r=gnzlbg
Deprecate RLIM_NLIMITS
This constant is not stable across OS versions, so it cannot be used in
any backwards- or forwards- compatible way. It's typically used to size
arrays in the kernel and in debugging utilities that are closely tied to
the OS version. Since libc is ignorant about OS versions, we shouldn't
even be defining it.
-rw-r--r-- | src/unix/bsd/apple/mod.rs | 4 | ||||
-rw-r--r-- | src/unix/bsd/freebsdlike/dragonfly/mod.rs | 4 | ||||
-rw-r--r-- | src/unix/bsd/freebsdlike/freebsd/mod.rs | 4 | ||||
-rw-r--r-- | src/unix/bsd/netbsdlike/netbsd/mod.rs | 4 | ||||
-rw-r--r-- | src/unix/bsd/netbsdlike/openbsd/mod.rs | 4 | ||||
-rw-r--r-- | src/unix/linux_like/linux/musl/b32/hexagon.rs | 4 | ||||
-rw-r--r-- | src/unix/solarish/mod.rs | 4 |
7 files changed, 28 insertions, 0 deletions
diff --git a/src/unix/bsd/apple/mod.rs b/src/unix/bsd/apple/mod.rs index 6d0a5bfe32..ced5170375 100644 --- a/src/unix/bsd/apple/mod.rs +++ b/src/unix/bsd/apple/mod.rs @@ -1862,6 +1862,10 @@ pub const RLIMIT_RSS: ::c_int = RLIMIT_AS; pub const RLIMIT_MEMLOCK: ::c_int = 6; pub const RLIMIT_NPROC: ::c_int = 7; pub const RLIMIT_NOFILE: ::c_int = 8; +#[deprecated( + since = "0.2.64", + note = "Not stable across OS versions" +)] pub const RLIM_NLIMITS: ::c_int = 9; pub const _RLIMIT_POSIX_FLAG: ::c_int = 0x1000; diff --git a/src/unix/bsd/freebsdlike/dragonfly/mod.rs b/src/unix/bsd/freebsdlike/dragonfly/mod.rs index 117d5ebd66..97d8509bcd 100644 --- a/src/unix/bsd/freebsdlike/dragonfly/mod.rs +++ b/src/unix/bsd/freebsdlike/dragonfly/mod.rs @@ -451,6 +451,10 @@ pub const ENOMEDIUM: ::c_int = 93; pub const EASYNC: ::c_int = 99; pub const ELAST: ::c_int = 99; 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; pub const Q_GETQUOTA: ::c_int = 0x300; diff --git a/src/unix/bsd/freebsdlike/freebsd/mod.rs b/src/unix/bsd/freebsdlike/freebsd/mod.rs index 9329d7f84f..c4ad2b3952 100644 --- a/src/unix/bsd/freebsdlike/freebsd/mod.rs +++ b/src/unix/bsd/freebsdlike/freebsd/mod.rs @@ -337,6 +337,10 @@ pub const RLIMIT_NPTS: ::c_int = 11; pub const RLIMIT_SWAP: ::c_int = 12; pub const RLIMIT_KQUEUES: ::c_int = 13; pub const RLIMIT_UMTXP: ::c_int = 14; +#[deprecated( + since = "0.2.64", + note = "Not stable across OS versions" +)] pub const RLIM_NLIMITS: ::rlim_t = 15; pub const Q_GETQUOTA: ::c_int = 0x700; diff --git a/src/unix/bsd/netbsdlike/netbsd/mod.rs b/src/unix/bsd/netbsdlike/netbsd/mod.rs index 9401c024bf..74b2334d84 100644 --- a/src/unix/bsd/netbsdlike/netbsd/mod.rs +++ b/src/unix/bsd/netbsdlike/netbsd/mod.rs @@ -741,6 +741,10 @@ pub const O_RSYNC : ::c_int = 0x00020000; pub const MS_SYNC : ::c_int = 0x4; pub const MS_INVALIDATE : ::c_int = 0x2; +#[deprecated( + since = "0.2.64", + note = "Not stable across OS versions" +)] pub const RLIM_NLIMITS: ::c_int = 12; pub const EIDRM: ::c_int = 82; diff --git a/src/unix/bsd/netbsdlike/openbsd/mod.rs b/src/unix/bsd/netbsdlike/openbsd/mod.rs index b50d815414..ffefefd819 100644 --- a/src/unix/bsd/netbsdlike/openbsd/mod.rs +++ b/src/unix/bsd/netbsdlike/openbsd/mod.rs @@ -757,6 +757,10 @@ pub const AT_SYMLINK_NOFOLLOW: ::c_int = 0x02; pub const AT_SYMLINK_FOLLOW: ::c_int = 0x04; pub const AT_REMOVEDIR: ::c_int = 0x08; +#[deprecated( + since = "0.2.64", + note = "Not stable across OS versions" +)] pub const RLIM_NLIMITS: ::c_int = 9; pub const SO_TIMESTAMP: ::c_int = 0x0800; diff --git a/src/unix/linux_like/linux/musl/b32/hexagon.rs b/src/unix/linux_like/linux/musl/b32/hexagon.rs index c866692531..2ff186f071 100644 --- a/src/unix/linux_like/linux/musl/b32/hexagon.rs +++ b/src/unix/linux_like/linux/musl/b32/hexagon.rs @@ -288,6 +288,10 @@ pub const RLIMIT_MEMLOCK: ::c_int = 8; pub const RLIMIT_NOFILE: ::c_int = 7; pub const RLIMIT_NPROC: ::c_int = 6; pub const RLIMIT_RSS: ::c_int = 5; +#[deprecated( + since = "0.2.64", + note = "Not stable across OS versions" +)] pub const RLIM_NLIMITS: ::c_int = 16; pub const SA_ONSTACK: ::c_int = 0x08000000; pub const SA_SIGINFO: ::c_int = 0x00000004; diff --git a/src/unix/solarish/mod.rs b/src/unix/solarish/mod.rs index f8a64547d4..5582e271d6 100644 --- a/src/unix/solarish/mod.rs +++ b/src/unix/solarish/mod.rs @@ -1199,6 +1199,10 @@ pub const RLIMIT_NOFILE: ::c_int = 5; pub const RLIMIT_VMEM: ::c_int = 6; pub const RLIMIT_AS: ::c_int = RLIMIT_VMEM; +#[deprecated( + since = "0.2.64", + note = "Not stable across OS versions" +)] pub const RLIM_NLIMITS: rlim_t = 7; pub const RLIM_INFINITY: rlim_t = 0x7fffffff; |