Remove deprecation from SA_ONSTACK; fix hexagon-unknown-linux-musl by androm3da · Pull Request #3335 · rust-lang/libc

androm3da · 2023-09-02T02:34:54Z

In ad3f860 the RLIM_* values were removed, but leaving behind a deprecation about RLIM_NLIMITS caused it to incorrectly apply instead to SA_ONSTACK.

rustbot · 2023-09-02T02:34:58Z

r? @JohnTitor

(rustbot has picked a reviewer for you, use r? to override)

androm3da · 2023-09-02T02:37:12Z

cc @lancethepants
cc @asomers

asomers

It looks like ad3f860also accidentally removed the deprecation notice from RLIM_NLIMITS. Can you please restore it?

androm3da · 2023-09-02T02:50:55Z

It looks like ad3f860also accidentally removed the deprecation notice from RLIM_NLIMITS. Can you please restore it?

I didn't look closely enough there, thanks. Will do.

androm3da · 2023-09-02T02:53:01Z

It looks like ad3f860also accidentally removed the deprecation notice from RLIM_NLIMITS. Can you please restore it?

Do I apply it to the RLIM_NLIMITS in src/unix/linux_like/linux/arch/generic/mod.rs or other instances as well?

asomers

Yes, you should apply the deprecation to all instances of RLIM_NLIMITS.

androm3da · 2023-09-04T00:26:25Z

Yes, you should apply the deprecation to all instances of RLIM_NLIMITS.

But I suppose applying it causes the build to fail. I could locally bypass this warning but is that really what we want?

error: use of deprecated constant `unix::linux_like::linux::arch::generic::RLIM_NLIMITS`: Not stable across OS versions
--> src/unix/linux_like/linux/arch/generic/mod.rs:260:59
|
260 | pub const RLIMIT_NLIMITS: ::__rlimit_resource_t = RLIM_NLIMITS;
| ^^^^^^^^^^^^
|
note: the lint level is defined here
--> src/lib.rs:20:38
|
20 | #![cfg_attr(libc_deny_warnings, deny(warnings))]
| ^^^^^^^^
= note: `#[deny(deprecated)]` implied by `#[deny(warnings)]`

asomers · 2023-09-04T13:52:40Z

Yes, you'll have to put a #[allow(deprecated)] at each one of those sites.

lancethepants · 2023-09-05T17:52:21Z

There are also references to RLIM_NLIMITS in sparc, mips and powerpc if those need to be labeled deprecated as well.

asomers · 2023-09-05T18:00:21Z

Yeah, all of them do. There's no way to reliably use that constant, given that the OS can change it at any time.

androm3da · 2023-09-05T21:45:46Z

Yeah, all of them do. There's no way to reliably use that constant, given that the OS can change it at any time.

Okay - so I'll apply the deprecation to RLIM{IT,}_NLIMITS for to all of the targets, then. And then #[allow(deprecated)] for any uses of either within the libc crate.

androm3da · 2023-09-05T21:47:44Z

Yeah, all of them do. There's no way to reliably use that constant, given that the OS can change it at any time.
Okay - so I'll apply the deprecation to RLIM{IT,}_NLIMITS for to all of the targets, then. And then #[allow(deprecated)] for any uses of either within the libc crate.

Also: RLIMIT_NLIMITS / RLIM_NLIMITS appears a few times within libc-test/semver/ - but no changes are required here?

asomers · 2023-09-05T22:09:57Z

Also: RLIMIT_NLIMITS / RLIM_NLIMITS appears a few times within libc-test/semver/ - but no changes are required here?

I'm not sure. I don't know how that part works. But if CI passes, then I wouldn't worry about it.

androm3da · 2023-09-06T23:21:12Z

Not changed: references to RLIM*_NLIMITS in fuchsia, aix, emscripten - but I suppose these are bound by the same limitation and I should mark them deprecated there too?

asomers · 2023-09-07T01:19:52Z

Yeah, it ought to be deprecated everywhere.

androm3da · 2023-09-07T03:20:10Z

cc @cramertj
cc @ecnelises

asomers

What about src/unix/bsd ?

ecnelises · 2023-09-07T05:07:52Z

Looks good to me about AIX. AIX has backward compatible RLIM_NLIMITS_* for elder versions, but not actually changed for very long time.

androm3da · 2023-09-07T13:06:22Z

What about src/unix/bsd ?

Looks like that's already as-expected.

$ rg -N -B3 '(RLIM|RLIMIT)_NLIM' src/unix/bsd/
src/unix/bsd/netbsdlike/openbsd/mod.rs
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;
src/unix/bsd/netbsdlike/netbsd/mod.rs
pub const RLIMIT_NTHR: ::c_int = 11;
#[deprecated(since = "0.2.64", note = "Not stable across OS versions")]
pub const RLIM_NLIMITS: ::c_int = 12;
src/unix/bsd/apple/mod.rs
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;
src/unix/bsd/freebsdlike/freebsd/mod.rs
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;
src/unix/bsd/freebsdlike/dragonfly/mod.rs
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;

asomers · 2023-09-07T13:27:47Z

What about src/unix/bsd ?
Looks like that's already as-expected.

Ahh, good. But what about Haiku and nto?

androm3da · 2023-09-08T04:19:05Z

Thanks, @asomers

Are you able to remove the S-waiting-on-review label and replace it with whatever's appropriate? I tried but I don't think I have permission to change this.

androm3da · 2023-09-13T15:26:41Z

Thanks, @asomers
Are you able to remove the S-waiting-on-review label and replace it with whatever's appropriate? I tried but I don't think I have permission to change this.

gentle ping @asomers

asomers · 2023-09-13T17:13:39Z

No, @androm3da I don't have any permissions in this repo.

ecnelises · 2023-09-14T06:25:41Z

@rustbot ready

ecnelises · 2023-09-14T06:53:23Z

Maybe @JohnTitor ?

androm3da · 2023-09-15T20:27:03Z

@rustbot review

androm3da · 2023-09-19T00:56:08Z

I have updated the commit message for ba6e03b to clarfiy that this is a fix for the libstd build for the hexagon-unknown-linux-musl target.

androm3da · 2023-09-22T13:39:44Z

r? @JohnTitor

rustbot · 2023-09-22T13:39:46Z

Could not assign reviewer from: JohnTitor.
User(s) JohnTitor are either the PR author, already assigned, or on vacation, and there are no other candidates.
Use r? to specify someone else to assign.

JohnTitor · 2023-09-29T19:40:52Z

Could you squash commits into one?

In ad3f860 the RLIM_* values were removed, but leaving behind a deprecation about RLIM_NLIMITS caused it to incorrectly apply instead to SA_ONSTACK. The deprecated SA_ONSTACK causes the libstd build for hexagon-unknown-linux-musl to fail. Also: apply RLIM*_NLIMITS deprecation to linux, emscripten, fuchsia, AIX, Haiku, NTO

androm3da · 2023-09-30T04:42:13Z

Could you squash commits into one?

Done. Sorry, I'd composed the commits independently in order to make it so that if the RLIM_LIMITS deprecation caused problems, that part could be reverted without reverting the un-deprecation of SA_ONSTACK. But I probably should've looked closer at the contribution guidelines.

androm3da · 2023-10-04T21:31:45Z

Thanks @JohnTitor, let me know if there's anything else I need to fix. 😁

JohnTitor · 2023-10-06T09:38:57Z

Thanks! @bors r+

bors · 2023-10-06T09:38:59Z

📌 Commit b3cf87f has been approved by JohnTitor

It is now in the queue for this repository.

bors · 2023-10-06T09:40:06Z

⌛ Testing commit b3cf87f with merge 14ef2e5...

bors · 2023-10-06T10:39:21Z

☀️ Test successful - checks-actions, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13, checks-cirrus-freebsd-14
Approved by: JohnTitor
Pushing 14ef2e5 to main...

rustbot assigned JohnTitor Sep 2, 2023

rustbot added the S-waiting-on-review label Sep 2, 2023

asomers suggested changes Sep 2, 2023
View reviewed changes

androm3da force-pushed the bcain/sa_onstack branch from 0af6e7f to 6461865Compare September 2, 2023 03:14

asomers suggested changes Sep 2, 2023
View reviewed changes

Comment threadsrc/unix/linux_like/linux/arch/generic/mod.rs Outdated

androm3da force-pushed the bcain/sa_onstack branch from 6461865 to 180d20bCompare September 2, 2023 21:27

androm3da force-pushed the bcain/sa_onstack branch from 180d20b to 442e7d2Compare September 5, 2023 15:52

asomers suggested changes Sep 5, 2023
View reviewed changes

Comment threadsrc/unix/linux_like/linux/arch/generic/mod.rs

androm3da force-pushed the bcain/sa_onstack branch from 442e7d2 to 1681345Compare September 6, 2023 23:19

asomers suggested changes Sep 7, 2023
View reviewed changes

androm3da force-pushed the bcain/sa_onstack branch from f0faab0 to 57ff42cCompare September 7, 2023 15:10

asomers approved these changes Sep 7, 2023
View reviewed changes

androm3da changed the title ~~Remove deprecation from SA_ONSTACK~~Remove deprecation from SA_ONSTACK; fix hexagon-unknown-linux-muslSep 19, 2023

androm3da force-pushed the bcain/sa_onstack branch from 57ff42c to 802af9bCompare September 19, 2023 00:55

androm3da force-pushed the bcain/sa_onstack branch from 802af9b to b3cf87fCompare September 30, 2023 04:39

bors added S-waiting-on-bors and removed S-waiting-on-review labels Oct 6, 2023

JohnTitor approved these changes Oct 6, 2023
View reviewed changes

bors merged commit 14ef2e5 into rust-lang:mainOct 6, 2023

bors mentioned this pull request Oct 6, 2023
upgrade to emscripten 3.1.41 #3307
Closed

github-actionsBot mentioned this pull request Oct 9, 2023
Automated pull from rust-lang/libcferrocene/ferrocene#35
Merged

coderabbitaiBot mentioned this pull request Jul 17, 2026
Clean up deprecations RustPython/RustPython#8300
Merged
2 tasks

Uh oh!

Conversation

androm3da commented Sep 2, 2023• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Sep 2, 2023

Uh oh!

androm3da commented Sep 2, 2023

Uh oh!

asomers left a comment

Choose a reason for hiding this comment

Uh oh!

androm3da commented Sep 2, 2023

Uh oh!

androm3da commented Sep 2, 2023

Uh oh!

asomers left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

androm3da commented Sep 4, 2023

Uh oh!

asomers commented Sep 4, 2023

Uh oh!

Uh oh!

lancethepants commented Sep 5, 2023• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

asomers commented Sep 5, 2023

Uh oh!

androm3da commented Sep 5, 2023

Uh oh!

androm3da commented Sep 5, 2023

Uh oh!

asomers commented Sep 5, 2023

Uh oh!

androm3da commented Sep 6, 2023

Uh oh!

asomers commented Sep 7, 2023

Uh oh!

androm3da commented Sep 7, 2023

Uh oh!

asomers left a comment

Choose a reason for hiding this comment

Uh oh!

ecnelises commented Sep 7, 2023

Uh oh!

androm3da commented Sep 7, 2023

Uh oh!

asomers commented Sep 7, 2023

Uh oh!

androm3da commented Sep 8, 2023

Uh oh!

androm3da commented Sep 13, 2023

Uh oh!

asomers commented Sep 13, 2023

Uh oh!

ecnelises commented Sep 14, 2023

Uh oh!

ecnelises commented Sep 14, 2023

Uh oh!

androm3da commented Sep 15, 2023

Uh oh!

androm3da commented Sep 19, 2023

Uh oh!

androm3da commented Sep 22, 2023

Uh oh!

rustbot commented Sep 22, 2023

Uh oh!

JohnTitor commented Sep 29, 2023

Uh oh!

androm3da commented Sep 30, 2023

Uh oh!

androm3da commented Oct 4, 2023

Uh oh!

JohnTitor commented Oct 6, 2023

Uh oh!

bors commented Oct 6, 2023

Uh oh!

bors commented Oct 6, 2023

androm3da commented Sep 2, 2023•
edited
Loading

lancethepants commented Sep 5, 2023•
edited
Loading