Add missing PS Vita definitions, fix some unused ones #3284

pheki · 2023-06-25T22:47:12Z

This PR improves vita's newlib support for std by adding some missing definitions and fixing some duplicated ones (e.g. EAI_NONAME from src/unix/newlib/vita/mod.rs was not being used as it was already defined on src/unix/newlib/mod.rs)

Previous work: #3209 #3255

cc @nikarh

rustbot · 2023-06-25T22:47:16Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @JohnTitor (or someone else) soon.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

@rustbot author: the review is finished, PR author should check the comments and take action accordingly
@rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

nikarh · 2023-06-29T12:53:06Z

src/unix/newlib/mod.rs

-pub const TCP_NODELAY: ::c_int = 8193;
-pub const TCP_MAXSEG: ::c_int = 8194;
+cfg_if! {
+    if #[cfg(target_os = "horizon")] {


This should be vita, horizon is for 3ds/switch

Nice catch!

nikarh

I checked every const/struct/function, and apart from horizon macro everything looks correct

pheki · 2023-06-30T02:47:04Z

TYSM @nikarh, just fixed that cfg

JohnTitor · 2023-07-10T19:21:49Z

@bors r+

bors · 2023-07-10T19:21:51Z

📌 Commit 4dcb762 has been approved by JohnTitor

It is now in the queue for this repository.

bors · 2023-07-10T20:16:19Z

⌛ Testing commit 4dcb762 with merge 09bbb91...

Add missing PS Vita definitions, fix some unused ones This PR improves vita's newlib support for std by adding some missing definitions and fixing some duplicated ones (e.g. `EAI_NONAME` from `src/unix/newlib/vita/mod.rs` was not being used as it was already defined on `src/unix/newlib/mod.rs`) Previous work: #3209 #3255 cc `@nikarh`

bors · 2023-07-10T21:14:58Z

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

bors · 2023-07-10T21:15:01Z

👀 Test was successful, but fast-forwarding failed: 422 Update is not a fast forward

pheki · 2023-07-10T21:56:16Z

Looks like rust-lang/homu#75, should we just retry?

JohnTitor · 2023-07-11T12:05:17Z

Sure, @bors retry

RalfJung · 2023-07-12T07:18:04Z

Is this the PR that is completely halting bors (across RA, miri, libc, ...) right now? Could someone try closing and re-opening it?

RalfJung · 2023-07-12T07:50:43Z

Bummer, this wasn't it seems. :( We'll have to wait for infra then I guess. Cc rust-lang/homu#191

riking · 2023-07-12T18:58:31Z

src/unix/newlib/mod.rs

+    if #[cfg(target_os = "vita")] {
+        pub const EAI_FAMILY: ::c_int = -6;
+        pub const EAI_MEMORY: ::c_int = -10;
+        pub const EAI_NONAME: ::c_int = -2;


The ordering here doesn't really make sense after this patch... maybe this could be pub use vita::{EAI_NONAME, ...}; ?

Good idea, I'll move those back to vita/mod.rs

Just did it

We can't add pub use as it goes against the library styling (pub use must go after all constants), but there's already a pub use self::vita::* at the end.

pheki · 2023-07-13T00:27:35Z

@rustbot review

pheki · 2023-08-23T23:23:31Z

@JohnTitor can I get a new review on this one? Rustbot had bugged and then I did a small change (@riking's suggestion)

Disabled socketpair for Vita There is no `socketpair` syscall in Vita newlib. This is reflected in a rust-lang/libc#3284, in which this method is removed for vita target. Also, we would need the fixes from the abovementioned PR for sockets in std (previously we had some incorrect constant values), but that can be done separately when rust-lang/libc#3284 is reviewed, merged, and released.

Rollup merge of rust-lang#115816 - vita-rust:vita, r=cuviper Disabled socketpair for Vita There is no `socketpair` syscall in Vita newlib. This is reflected in a rust-lang/libc#3284, in which this method is removed for vita target. Also, we would need the fixes from the abovementioned PR for sockets in std (previously we had some incorrect constant values), but that can be done separately when rust-lang/libc#3284 is reviewed, merged, and released.

pheki · 2023-09-23T23:33:06Z

Maybe we need to retry? Looks like it failed to start one BSD test on cirrus

JohnTitor · 2023-09-24T00:59:01Z

Seems so, @bors retry

bors · 2023-09-24T01:00:09Z

⌛ Testing commit 3c0b407 with merge 8b58e8d...

Add missing PS Vita definitions, fix some unused ones This PR improves vita's newlib support for std by adding some missing definitions and fixing some duplicated ones (e.g. `EAI_NONAME` from `src/unix/newlib/vita/mod.rs` was not being used as it was already defined on `src/unix/newlib/mod.rs`) Previous work: #3209 #3255 cc `@nikarh`

bors · 2023-09-24T01:56:18Z

💔 Test failed - checks-actions

Combination of 10 commits: * Add missing PS Vita definitions, fix some unused ones * Fix cfg's target_os * Move conflicting EAI_* definitions back to vita-specific file * Remove out-of-order pub uses * Added padding to dirent and fixed clockid_t * Use repr(align()) instead of zero field * Fixed sockaddr structs * Fixup * socketpair is not available on vita * Lint Co-authored-by: Nikolay Arhipov <[email protected]>

nikarh · 2023-09-24T07:26:34Z

The problem was that dirent struct was defined in dirent module.
Moved the shared dirent to newlib/generic.rs and added reexports to all newlib targets but vita which has a different dirent definition.

Should I squash the fix to the main commit?

JohnTitor · 2023-09-24T14:13:01Z

If commits are too many, it'd be great to be squashed, but 2 commits are fine by me, thank you!
@bors r+

bors · 2023-09-24T14:13:03Z

📌 Commit 53c6b31 has been approved by JohnTitor

It is now in the queue for this repository.

bors · 2023-09-24T14:14:10Z

⌛ Testing commit 53c6b31 with merge e740c20...

bors · 2023-09-24T15:15:50Z

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

Update crate version to 0.2.149 Contains fixes for net structs/calls for Vita target - #3284 and #3366. Required for rust-lang/socket2/pull/465

Updated libc and doc for Vita target Doc changes: - Updated Vita target readme. The recommended approach to build artifacts for the platform now is [cargo-vita](https://crates.io/crates/cargo-vita) which wraps all the convoluted steps previously described in a yaml for `cargo-make` - Updated maintainer list for Vita target. (`@ZetaNumbers` `@pheki` please agree to be added to the list, `@amg98` please let us know if you're still planning on actively maintaining target support) Code changes: - ~Updated libc for rust-lang/libc#3284 and rust-lang/libc#3366~ (Already merged in rust-lang#116527) - In dupfd changed the flag same as for esp target, there is no CLOEXEC on Vita - Enabled `new_pair` since we've implemented `socketpair` in Vita newlib

Updated libc and doc for Vita target Doc changes: - Updated Vita target readme. The recommended approach to build artifacts for the platform now is [cargo-vita](https://crates.io/crates/cargo-vita) which wraps all the convoluted steps previously described in a yaml for `cargo-make` - Updated maintainer list for Vita target. (`@ZetaNumbers` `@pheki` please agree to be added to the list, `@amg98` please let us know if you're still planning on actively maintaining target support) Code changes: - ~Updated libc for rust-lang/libc#3284 and rust-lang/libc#3366~ (Already merged in #116527) - In dupfd changed the flag same as for esp target, there is no CLOEXEC on Vita - Enabled `new_pair` since we've implemented `socketpair` in Vita newlib

rustbot assigned JohnTitor Jun 25, 2023

rustbot added the S-waiting-on-review label Jun 25, 2023

nikarh reviewed Jun 29, 2023

View reviewed changes

nikarh suggested changes Jun 29, 2023

View reviewed changes

nikarh approved these changes Jun 30, 2023

View reviewed changes

JohnTitor approved these changes Jul 10, 2023

View reviewed changes

bors added S-waiting-on-bors and removed S-waiting-on-review labels Jul 10, 2023

pheki closed this Jul 12, 2023

pheki reopened this Jul 12, 2023

riking reviewed Jul 12, 2023

View reviewed changes

rustbot added the S-waiting-on-review label Jul 13, 2023

pheki mentioned this pull request Sep 6, 2023

Add support for vita rust-lang/socket2#465

Merged

nikarh mentioned this pull request Sep 13, 2023

Disabled socketpair for Vita rust-lang/rust#115816

Merged

bors added the S-waiting-on-review label Sep 23, 2023

bors added S-waiting-on-bors and removed S-waiting-on-review labels Sep 24, 2023

bors added S-waiting-on-review and removed S-waiting-on-bors labels Sep 24, 2023

pheki and others added 2 commits September 24, 2023 10:21

Moved dirent to generic.rs

53c6b31

bors added S-waiting-on-bors and removed S-waiting-on-review labels Sep 24, 2023

bors merged commit e740c20 into rust-lang:main Sep 24, 2023
10 checks passed

bors mentioned this pull request Sep 24, 2023

Fix newlib #3345

Draft

nikarh mentioned this pull request Sep 24, 2023

Update crate version to 0.2.149 #3360

Merged

0323pin mentioned this pull request Sep 25, 2023

Add backtrace definitions and support for statvfs #3361

Closed

bors added a commit that referenced this pull request Oct 6, 2023

Auto merge of #3360 - vita-rust:release-0.2.149, r=JohnTitor

d80e8bd

Update crate version to 0.2.149 Contains fixes for net structs/calls for Vita target - #3284 and #3366. Required for rust-lang/socket2/pull/465

nikarh mentioned this pull request Oct 7, 2023

Updated libc and doc for Vita target rust-lang/rust#116518

Merged

nikarh mentioned this pull request Oct 20, 2023

Added vita target support tokio-rs/tokio#6094

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add missing PS Vita definitions, fix some unused ones #3284

Add missing PS Vita definitions, fix some unused ones #3284

pheki commented Jun 25, 2023

rustbot commented Jun 25, 2023

nikarh Jun 29, 2023

pheki Jun 30, 2023

nikarh left a comment •

edited

Loading

pheki commented Jun 30, 2023

JohnTitor commented Jul 10, 2023

bors commented Jul 10, 2023

bors commented Jul 10, 2023

bors commented Jul 10, 2023

bors commented Jul 10, 2023

pheki commented Jul 10, 2023

JohnTitor commented Jul 11, 2023

RalfJung commented Jul 12, 2023

RalfJung commented Jul 12, 2023 via email

riking Jul 12, 2023

pheki Jul 12, 2023 •

edited

Loading

pheki Jul 13, 2023

pheki commented Jul 13, 2023

pheki commented Aug 23, 2023

pheki commented Sep 23, 2023

JohnTitor commented Sep 24, 2023

bors commented Sep 24, 2023

bors commented Sep 24, 2023

nikarh commented Sep 24, 2023 •

edited

Loading

JohnTitor commented Sep 24, 2023

bors commented Sep 24, 2023

bors commented Sep 24, 2023

bors commented Sep 24, 2023

Add missing PS Vita definitions, fix some unused ones #3284

Add missing PS Vita definitions, fix some unused ones #3284

Conversation

pheki commented Jun 25, 2023

rustbot commented Jun 25, 2023

nikarh Jun 29, 2023

Choose a reason for hiding this comment

pheki Jun 30, 2023

Choose a reason for hiding this comment

nikarh left a comment • edited Loading

Choose a reason for hiding this comment

pheki commented Jun 30, 2023

JohnTitor commented Jul 10, 2023

bors commented Jul 10, 2023

bors commented Jul 10, 2023

bors commented Jul 10, 2023

bors commented Jul 10, 2023

pheki commented Jul 10, 2023

JohnTitor commented Jul 11, 2023

RalfJung commented Jul 12, 2023

RalfJung commented Jul 12, 2023 via email

riking Jul 12, 2023

Choose a reason for hiding this comment

pheki Jul 12, 2023 • edited Loading

Choose a reason for hiding this comment

pheki Jul 13, 2023

Choose a reason for hiding this comment

pheki commented Jul 13, 2023

pheki commented Aug 23, 2023

pheki commented Sep 23, 2023

JohnTitor commented Sep 24, 2023

bors commented Sep 24, 2023

bors commented Sep 24, 2023

nikarh commented Sep 24, 2023 • edited Loading

JohnTitor commented Sep 24, 2023

bors commented Sep 24, 2023

bors commented Sep 24, 2023

bors commented Sep 24, 2023

nikarh left a comment •

edited

Loading

pheki Jul 12, 2023 •

edited

Loading

nikarh commented Sep 24, 2023 •

edited

Loading