Add struct ctl_info #3046

siegfried · 2022-12-23T10:43:34Z

Add the struct mentioned in #3045

Not sure if I should add CTLIOCGINFO because it is wrapped in a macro:

#define CTLIOCGINFO     _IOWR('N', 3, struct ctl_info)  /* get id from name */

The C definition of ctl_info is:

/*!
 *       @defined MAX_KCTL_NAME
 *   @discussion Kernel control names must be no longer than
 *       MAX_KCTL_NAME.
 */
#define MAX_KCTL_NAME   96

/*
 * Controls destined to the Controller Manager.
 */

/*!
 *       @struct ctl_info
 *       @discussion This structure is used with the CTLIOCGINFO ioctl to
 *               translate from a kernel control name to a control id.
 *       @field ctl_id The kernel control id, filled out upon return.
 *       @field ctl_name The kernel control name to find.
 */
struct ctl_info {
	u_int32_t   ctl_id;                             /* Kernel Controller ID  */
	char        ctl_name[MAX_KCTL_NAME];            /* Kernel Controller Name (a C string) */
};

rustbot · 2022-12-23T10:43:38Z

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.

JohnTitor · 2023-01-05T10:32:47Z

Thanks! @bors r+

bors · 2023-01-05T10:32:49Z

📌 Commit 0da767e has been approved by JohnTitor

It is now in the queue for this repository.

bors · 2023-01-05T10:32:56Z

⌛ Testing commit 0da767e with merge 664ba6d...

Add struct ctl_info Add the struct mentioned in #3045 Not sure if I should add `CTLIOCGINFO ` because it is wrapped in a macro: ```c #define CTLIOCGINFO _IOWR('N', 3, struct ctl_info) /* get id from name */ ``` The C definition of `ctl_info` is: ```c /*! * `@defined` MAX_KCTL_NAME * `@discussion` Kernel control names must be no longer than * MAX_KCTL_NAME. */ #define MAX_KCTL_NAME 96 /* * Controls destined to the Controller Manager. */ /*! * `@struct` ctl_info * `@discussion` This structure is used with the CTLIOCGINFO ioctl to * translate from a kernel control name to a control id. * `@field` ctl_id The kernel control id, filled out upon return. * `@field` ctl_name The kernel control name to find. */ struct ctl_info { u_int32_t ctl_id; /* Kernel Controller ID */ char ctl_name[MAX_KCTL_NAME]; /* Kernel Controller Name (a C string) */ }; ```

bors · 2023-01-05T11:37:31Z

💔 Test failed - checks-actions

src/unix/bsd/apple/mod.rs

JohnTitor

It'd also be great if you could squash commits into one.

build.rs

JohnTitor · 2023-01-08T18:59:25Z

Could you squash commits into one to clean up the history?

siegfried · 2023-01-08T20:02:16Z

Could you squash commits into one to clean up the history?

Sure, if you have trouble squash merging on your side.

JohnTitor · 2023-01-08T20:09:56Z

This repo uses bors and the bot only can merge PRs via merge commits. So you have to do that before merging.

siegfried · 2023-01-08T20:12:33Z

Squashed.

JohnTitor · 2023-01-08T20:17:01Z

👍, @bors r+

bors · 2023-01-08T20:17:03Z

📌 Commit 9013963 has been approved by JohnTitor

It is now in the queue for this repository.

Add struct ctl_info Add the struct mentioned in #3045 Not sure if I should add `CTLIOCGINFO ` because it is wrapped in a macro: ```c #define CTLIOCGINFO _IOWR('N', 3, struct ctl_info) /* get id from name */ ``` The C definition of `ctl_info` is: ```c /*! * `@defined` MAX_KCTL_NAME * `@discussion` Kernel control names must be no longer than * MAX_KCTL_NAME. */ #define MAX_KCTL_NAME 96 /* * Controls destined to the Controller Manager. */ /*! * `@struct` ctl_info * `@discussion` This structure is used with the CTLIOCGINFO ioctl to * translate from a kernel control name to a control id. * `@field` ctl_id The kernel control id, filled out upon return. * `@field` ctl_name The kernel control name to find. */ struct ctl_info { u_int32_t ctl_id; /* Kernel Controller ID */ char ctl_name[MAX_KCTL_NAME]; /* Kernel Controller Name (a C string) */ }; ```

bors · 2023-01-08T20:17:10Z

⌛ Testing commit 9013963 with merge 6cf3080...

bors · 2023-01-08T21:13:36Z

💔 Test failed - checks-actions

bors · 2023-01-12T10:18:27Z

💔 Test failed - checks-actions

siegfried · 2023-01-12T19:53:35Z

Still not working?

JohnTitor · 2023-01-12T21:02:14Z

+ cargo +1.13.0 build -vv --no-default-features --target aarch64-apple-ios
warning: unused manifest key: package.categories
warning: unused manifest key: package.categories
warning: unused manifest key: package.categories
    Updating registry `[https://github.com/rust-lang/crates.io-index`](https://github.com/rust-lang/crates.io-index%60)
error: failed to parse registry's information for: serde

Caused by:
  Feature `playground` depends on `serde_derive` which is not an optional dependency.
Consider adding `optional = true` to the dependency

I believe it's unrelated to this PR, let me investigate after my day job.

JohnTitor · 2023-01-13T13:47:03Z

rust-lang/crates.io#5929 should fix the issue, let's try out, @bors retry

bors · 2023-01-13T13:47:14Z

⌛ Testing commit dfa2165 with merge a552a85...

Add struct ctl_info Add the struct mentioned in #3045 Not sure if I should add `CTLIOCGINFO ` because it is wrapped in a macro: ```c #define CTLIOCGINFO _IOWR('N', 3, struct ctl_info) /* get id from name */ ``` The C definition of `ctl_info` is: ```c /*! * `@defined` MAX_KCTL_NAME * `@discussion` Kernel control names must be no longer than * MAX_KCTL_NAME. */ #define MAX_KCTL_NAME 96 /* * Controls destined to the Controller Manager. */ /*! * `@struct` ctl_info * `@discussion` This structure is used with the CTLIOCGINFO ioctl to * translate from a kernel control name to a control id. * `@field` ctl_id The kernel control id, filled out upon return. * `@field` ctl_name The kernel control name to find. */ struct ctl_info { u_int32_t ctl_id; /* Kernel Controller ID */ char ctl_name[MAX_KCTL_NAME]; /* Kernel Controller Name (a C string) */ }; ```

bors · 2023-01-13T14:00:54Z

💔 Test failed - checks-actions

siegfried · 2023-01-13T20:20:28Z

I rebased the commit to the tip.

JohnTitor · 2023-01-14T03:29:09Z

The failure is valid:

error[E0277]: the trait bound `[i8; 96]: core::fmt::Debug` is not satisfied
   --> src/unix/bsd/apple/long_array.rs:4:9
    |
4   |           pub ctl_name: [::c_char; MAX_KCTL_NAME],
    |           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `[i8; 96]` cannot be formatted using `:?`; if it is defined in your crate, add `#[derive(Debug)]` or manually implement it
    | 
   ::: src/lib.rs
    |
93  | / cfg_if! {
94  | |     if #[cfg(windows)] {
95  | |         mod fixed_width_ints;
96  | |         pub use fixed_width_ints::*;
...   |
156 | |     }
157 | | }
    | |_- in this macro invocation
    |
    = help: the trait `core::fmt::Debug` is not implemented for `[i8; 96]`
    = note: required because of the requirements on the impl of `core::fmt::Debug` for `&[i8; 96]`
    = note: required for the cast to the object type `core::fmt::Debug`

error[E0277]: the trait bound `[i8; 96]: core::cmp::Eq` is not satisfied
   --> src/unix/bsd/apple/long_array.rs:4:9
    |
4   |           pub ctl_name: [::c_char; MAX_KCTL_NAME],
    |           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `core::cmp::Eq` is not implemented for `[i8; 96]`
    | 
   ::: src/lib.rs
    |
93  | / cfg_if! {
94  | |     if #[cfg(windows)] {
95  | |         mod fixed_width_ints;
96  | |         pub use fixed_width_ints::*;
...   |
156 | |     }
157 | | }
    | |_- in this macro invocation
    |
    = help: the following implementations were found:
              <[T; 19] as core::cmp::Eq>
              <[T; 22] as core::cmp::Eq>
              <[T; 10] as core::cmp::Eq>
              <[T; 32] as core::cmp::Eq>
            and 30 others
    = note: required by `core::cmp::AssertParamIsEq`

error[E0277]: the trait bound `[i8; 96]: core::hash::Hash` is not satisfied
   --> src/unix/bsd/apple/long_array.rs:4:9
    |
4   |           pub ctl_name: [::c_char; MAX_KCTL_NAME],
    |           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `core::hash::Hash` is not implemented for `[i8; 96]`
    | 
   ::: src/lib.rs
    |
93  | / cfg_if! {
94  | |     if #[cfg(windows)] {
95  | |         mod fixed_width_ints;
96  | |         pub use fixed_width_ints::*;
...   |
156 | |     }
157 | | }
    | |_- in this macro invocation
    |
    = help: the following implementations were found:
              <[T; 20] as core::hash::Hash>
              <[T] as core::hash::Hash>
              <[T; 23] as core::hash::Hash>
              <[T; 12] as core::hash::Hash>
            and 30 others
    = note: required by `core::hash::Hash::hash`

error[E0369]: binary operation `==` cannot be applied to type `[i8; 96]`
   --> src/unix/bsd/apple/long_array.rs:4:9
    |
4   |           pub ctl_name: [::c_char; MAX_KCTL_NAME],
    |           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    | 
   ::: src/lib.rs
    |
93  | / cfg_if! {
94  | |     if #[cfg(windows)] {
95  | |         mod fixed_width_ints;
96  | |         pub use fixed_width_ints::*;
...   |
156 | |     }
157 | | }
    | |_- in this macro invocation
    |
    = note: an implementation of `std::cmp::PartialEq` might be missing for `[i8; 96]`

error[E0369]: binary operation `!=` cannot be applied to type `[i8; 96]`
   --> src/unix/bsd/apple/long_array.rs:4:9
    |
4   |           pub ctl_name: [::c_char; MAX_KCTL_NAME],
    |           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    | 
   ::: src/lib.rs
    |
93  | / cfg_if! {
94  | |     if #[cfg(windows)] {
95  | |         mod fixed_width_ints;
96  | |         pub use fixed_width_ints::*;
...   |
156 | |     }
157 | | }
    | |_- in this macro invocation
    |
    = note: an implementation of `std::cmp::PartialEq` might be missing for `[i8; 96]`

1.19 cannot impl it and we have to use s_no_extra_traits! and manually impl them, I think.

siegfried · 2023-01-14T03:41:25Z

How about support >= 1.20 only? Updated.

JohnTitor · 2023-01-18T14:53:05Z

It will require 1.47, but it sounds good to me as I think it's old enough 👍

siegfried · 2023-01-21T08:45:41Z

Sorry, I just saw this. Now I've changed the version to >= 1.47. Please review.

JohnTitor · 2023-01-21T08:53:36Z

No worries, thanks! @bors r+

bors · 2023-01-21T08:53:38Z

📌 Commit 950827b has been approved by JohnTitor

It is now in the queue for this repository.

bors · 2023-01-21T08:53:45Z

⌛ Testing commit 950827b with merge f1bb40a...

bors · 2023-01-21T09:57:51Z

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

rustbot assigned JohnTitor Dec 23, 2022

rustbot added the S-waiting-on-review label Dec 23, 2022

siegfried mentioned this pull request Dec 25, 2022

Support macOS siegfried/utuntap#28

Merged

JohnTitor mentioned this pull request Dec 27, 2022

apple add ctl_info. #3052

Closed

JohnTitor approved these changes Jan 5, 2023

View reviewed changes

bors added S-waiting-on-bors and removed S-waiting-on-review labels Jan 5, 2023

bors added S-waiting-on-review and removed S-waiting-on-bors labels Jan 5, 2023

JohnTitor reviewed Jan 5, 2023

View reviewed changes

src/unix/bsd/apple/mod.rs Outdated Show resolved Hide resolved

JohnTitor reviewed Jan 8, 2023

View reviewed changes

build.rs Outdated Show resolved Hide resolved

siegfried force-pushed the ctl_info branch from 813a962 to 9013963 Compare January 8, 2023 20:11

bors added S-waiting-on-bors and removed S-waiting-on-review labels Jan 8, 2023

bors removed the S-waiting-on-bors label Jan 8, 2023

bors added S-waiting-on-review and removed S-waiting-on-bors labels Jan 12, 2023

bors added S-waiting-on-bors and removed S-waiting-on-review labels Jan 13, 2023

bors added S-waiting-on-review and removed S-waiting-on-bors labels Jan 13, 2023

siegfried force-pushed the ctl_info branch from dfa2165 to d2420ac Compare January 13, 2023 20:18

siegfried force-pushed the ctl_info branch from d2420ac to d0491a8 Compare January 14, 2023 03:39

Add struct ctl_info for Apple

950827b

siegfried force-pushed the ctl_info branch from d0491a8 to 950827b Compare January 21, 2023 08:44

bors added S-waiting-on-bors and removed S-waiting-on-review labels Jan 21, 2023

bors merged commit f1bb40a into rust-lang:master Jan 21, 2023

siegfried deleted the ctl_info branch April 28, 2023 17:57

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add struct ctl_info #3046

Add struct ctl_info #3046

siegfried commented Dec 23, 2022

rustbot commented Dec 23, 2022

JohnTitor commented Jan 5, 2023

bors commented Jan 5, 2023

bors commented Jan 5, 2023

bors commented Jan 5, 2023

JohnTitor left a comment

JohnTitor commented Jan 8, 2023

siegfried commented Jan 8, 2023

JohnTitor commented Jan 8, 2023

siegfried commented Jan 8, 2023

JohnTitor commented Jan 8, 2023

bors commented Jan 8, 2023

bors commented Jan 8, 2023

bors commented Jan 8, 2023

bors commented Jan 12, 2023

siegfried commented Jan 12, 2023

JohnTitor commented Jan 12, 2023

JohnTitor commented Jan 13, 2023

bors commented Jan 13, 2023

bors commented Jan 13, 2023

siegfried commented Jan 13, 2023

JohnTitor commented Jan 14, 2023

siegfried commented Jan 14, 2023

JohnTitor commented Jan 18, 2023

siegfried commented Jan 21, 2023 •

edited

Loading

JohnTitor commented Jan 21, 2023

bors commented Jan 21, 2023

bors commented Jan 21, 2023

bors commented Jan 21, 2023

Add struct ctl_info #3046

Add struct ctl_info #3046

Conversation

siegfried commented Dec 23, 2022

rustbot commented Dec 23, 2022

JohnTitor commented Jan 5, 2023

bors commented Jan 5, 2023

bors commented Jan 5, 2023

bors commented Jan 5, 2023

JohnTitor left a comment

Choose a reason for hiding this comment

JohnTitor commented Jan 8, 2023

siegfried commented Jan 8, 2023

JohnTitor commented Jan 8, 2023

siegfried commented Jan 8, 2023

JohnTitor commented Jan 8, 2023

bors commented Jan 8, 2023

bors commented Jan 8, 2023

bors commented Jan 8, 2023

bors commented Jan 12, 2023

siegfried commented Jan 12, 2023

JohnTitor commented Jan 12, 2023

JohnTitor commented Jan 13, 2023

bors commented Jan 13, 2023

bors commented Jan 13, 2023

siegfried commented Jan 13, 2023

JohnTitor commented Jan 14, 2023

siegfried commented Jan 14, 2023

JohnTitor commented Jan 18, 2023

siegfried commented Jan 21, 2023 • edited Loading

JohnTitor commented Jan 21, 2023

bors commented Jan 21, 2023

bors commented Jan 21, 2023

bors commented Jan 21, 2023

siegfried commented Jan 21, 2023 •

edited

Loading