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.

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

[0.2] Backports #3969

Merged
merged 8 commits into from
Oct 15, 2024
Merged

[0.2] Backports #3969

merged 8 commits into from
Oct 15, 2024

Conversation

@rustbot
Copy link
Collaborator

rustbot commented Oct 15, 2024

r? @JohnTitor

rustbot has assigned @JohnTitor.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

PaulDance and others added 7 commits October 15, 2024 00:51
* Feat(apple): Add LOCAL_PEERTOKEN

Taken from `sys/un.h`.

Signed-off-by: Paul Mabileau <[email protected]>

* Docs(apple): Add description for LOCAL_PEER* socket options

Signed-off-by: Paul Mabileau <[email protected]>

* Chore(test/apple): Add the LOCAL_PEERTOKEN symbol

Signed-off-by: Paul Mabileau <[email protected]>

---------

Signed-off-by: Paul Mabileau <[email protected]>

(backport <rust-lang#3929>)
(cherry picked from commit 0a25ed8)
`mach_error_string` is defined in `/usr/include/mach/mach_error.h`
It is not referenced in the documentation Apple website.

```
char            *mach_error_string(
/*
 *  Returns a string appropriate to the error argument given
 */
    mach_error_t error_value
    );
```

`mach_error_t` is defined in `/usr/include/mach/error.h`
https://developer.apple.com/documentation/kernel/mach_error_t

```
typedef kern_return_t   mach_error_t;
```

(backport <rust-lang#3913>)
(cherry picked from commit d8ff07b)
(backport <rust-lang#3920>)
(cherry picked from commit 133d9d0)
(backport <rust-lang#3920>)
(cherry picked from commit 6f2b73a)
@tgross35 tgross35 added this pull request to the merge queue Oct 15, 2024
Merged via the queue into rust-lang:libc-0.2 with commit f4f1ae9 Oct 15, 2024
52 of 53 checks passed
@tgross35 tgross35 deleted the backport-corn branch October 15, 2024 07:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants