Merge enum impl blocks

components/arkui/src/drag_and_drop/drag_and_drop_ffi.rs

@@ -11,16 +11,8 @@ pub use ohos_sys_opaque_types::OH_PixelmapNative;
 impl ArkUI_DragResult {
     /// The drag and drop operation succeeded.
     pub const SUCCESSFUL: ArkUI_DragResult = ArkUI_DragResult(0);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_DragResult {
     /// The drag and drop operation failed.
     pub const FAILED: ArkUI_DragResult = ArkUI_DragResult(1);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_DragResult {
     /// The drag and drop operation was canceled.
     pub const CANCELED: ArkUI_DragResult = ArkUI_DragResult(2);
 }
@@ -39,10 +31,6 @@ pub struct ArkUI_DragResult(pub ::core::ffi::c_uint);
 impl ArkUI_DropOperation {
     /// Copy.
     pub const ARKUI_DROP_OPERATION_COPY: ArkUI_DropOperation = ArkUI_DropOperation(0);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_DropOperation {
     /// Cut.
     pub const ARKUI_DROP_OPERATION_MOVE: ArkUI_DropOperation = ArkUI_DropOperation(1);
 }
@@ -60,51 +48,23 @@ pub struct ArkUI_DropOperation(pub ::core::ffi::c_uint);
 impl ArkUI_PreDragStatus {
     /// Unknown.
     pub const ARKUI_PRE_DRAG_STATUS_UNKNOWN: ArkUI_PreDragStatus = ArkUI_PreDragStatus(-1);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_PreDragStatus {
     /// A drag gesture is being detected.
     pub const ARKUI_PRE_DRAG_STATUS_ACTION_DETECTING: ArkUI_PreDragStatus = ArkUI_PreDragStatus(0);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_PreDragStatus {
     /// The component is ready to be dragged.
     pub const ARKUI_PRE_DRAG_STATUS_READY_TO_TRIGGER_DRAG: ArkUI_PreDragStatus =
         ArkUI_PreDragStatus(1);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_PreDragStatus {
     /// A lift animation is started.
     pub const ARKUI_PRE_DRAG_STATUS_PREVIEW_LIFT_STARTED: ArkUI_PreDragStatus =
         ArkUI_PreDragStatus(2);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_PreDragStatus {
     /// A lift animation is finished.
     pub const ARKUI_PRE_DRAG_STATUS_PREVIEW_LIFT_FINISHED: ArkUI_PreDragStatus =
         ArkUI_PreDragStatus(3);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_PreDragStatus {
     /// A drop animation is started.
     pub const ARKUI_PRE_DRAG_STATUS_PREVIEW_LANDING_STARTED: ArkUI_PreDragStatus =
         ArkUI_PreDragStatus(4);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_PreDragStatus {
     /// A drop animation is finished.
     pub const ARKUI_PRE_DRAG_STATUS_PREVIEW_LANDING_FINISHED: ArkUI_PreDragStatus =
         ArkUI_PreDragStatus(5);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_PreDragStatus {
     /// A drop animation is terminated.
     pub const ARKUI_PRE_DRAG_STATUS_CANCELED_BEFORE_DRAG: ArkUI_PreDragStatus =
         ArkUI_PreDragStatus(6);
@@ -125,10 +85,6 @@ impl ArkUI_DragPreviewScaleMode {
     /// scales the drag preview based on set rules.
     pub const ARKUI_DRAG_PREVIEW_SCALE_AUTO: ArkUI_DragPreviewScaleMode =
         ArkUI_DragPreviewScaleMode(0);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_DragPreviewScaleMode {
     /// The system does not scale the drag preview.
     pub const ARKUI_DRAG_PREVIEW_SCALE_DISABLED: ArkUI_DragPreviewScaleMode =
         ArkUI_DragPreviewScaleMode(1);
@@ -147,16 +103,8 @@ pub struct ArkUI_DragPreviewScaleMode(pub ::core::ffi::c_uint);
 impl ArkUI_DragStatus {
     /// Unknown.
     pub const ARKUI_DRAG_STATUS_UNKNOWN: ArkUI_DragStatus = ArkUI_DragStatus(-1);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_DragStatus {
     /// Started.
     pub const ARKUI_DRAG_STATUS_STARTED: ArkUI_DragStatus = ArkUI_DragStatus(0);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_DragStatus {
     /// Ended.
     pub const ARKUI_DRAG_STATUS_ENDED: ArkUI_DragStatus = ArkUI_DragStatus(1);
 }

components/arkui/src/native_dialog/native_dialog_ffi.rs

@@ -10,22 +10,10 @@ use crate::native_type::*;
 impl ArkUI_DismissReason {
     /// Touching the system-defined Back button or pressing the Esc key.
     pub const DIALOG_DISMISS_BACK_PRESS: ArkUI_DismissReason = ArkUI_DismissReason(0);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_DismissReason {
     /// Touching the mask.
     pub const DIALOG_DISMISS_TOUCH_OUTSIDE: ArkUI_DismissReason = ArkUI_DismissReason(1);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_DismissReason {
     /// Touching the Close button.
     pub const DIALOG_DISMISS_CLOSE_BUTTON: ArkUI_DismissReason = ArkUI_DismissReason(2);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_DismissReason {
     /// Sliding down.
     pub const DIALOG_DISMISS_SLIDE_DOWN: ArkUI_DismissReason = ArkUI_DismissReason(3);
 }

components/arkui/src/native_gesture/native_gesture_ffi.rs

@@ -24,24 +24,12 @@ impl ArkUI_GestureEventActionType {
     /// Triggered.
     pub const GESTURE_EVENT_ACTION_ACCEPT: ArkUI_GestureEventActionType =
         ArkUI_GestureEventActionType(1);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_GestureEventActionType {
     /// Updated.
     pub const GESTURE_EVENT_ACTION_UPDATE: ArkUI_GestureEventActionType =
         ArkUI_GestureEventActionType(2);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_GestureEventActionType {
     /// Ended.
     pub const GESTURE_EVENT_ACTION_END: ArkUI_GestureEventActionType =
         ArkUI_GestureEventActionType(4);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_GestureEventActionType {
     /// Canceled.
     pub const GESTURE_EVENT_ACTION_CANCEL: ArkUI_GestureEventActionType =
         ArkUI_GestureEventActionType(8);
@@ -70,16 +58,8 @@ pub type ArkUI_GestureEventActionTypeMask = u32;
 impl ArkUI_GesturePriority {
     /// Normal.
     pub const NORMAL: ArkUI_GesturePriority = ArkUI_GesturePriority(0);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_GesturePriority {
     /// High-priority.
     pub const PRIORITY: ArkUI_GesturePriority = ArkUI_GesturePriority(1);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_GesturePriority {
     /// Parallel.
     pub const PARALLEL: ArkUI_GesturePriority = ArkUI_GesturePriority(2);
 }
@@ -96,17 +76,9 @@ pub struct ArkUI_GesturePriority(pub ::core::ffi::c_uint);
 #[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
 impl ArkUI_GroupGestureMode {
     pub const SEQUENTIAL_GROUP: ArkUI_GroupGestureMode = ArkUI_GroupGestureMode(0);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_GroupGestureMode {
     /// Parallel recognition. Registered gestures are recognized concurrently until all gestures are recognized.
     /// The recognition result of each gesture does not affect each other.
     pub const PARALLEL_GROUP: ArkUI_GroupGestureMode = ArkUI_GroupGestureMode(1);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_GroupGestureMode {
     /// Exclusive recognition. Registered gestures are identified concurrently.
     /// If one gesture is successfully recognized, gesture recognition ends.
     pub const EXCLUSIVE_GROUP: ArkUI_GroupGestureMode = ArkUI_GroupGestureMode(2);
@@ -125,46 +97,18 @@ pub struct ArkUI_GroupGestureMode(pub ::core::ffi::c_uint);
 impl ArkUI_GestureDirection {
     /// All directions.
     pub const GESTURE_DIRECTION_ALL: ArkUI_GestureDirection = ArkUI_GestureDirection(15);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_GestureDirection {
     /// Horizontal direction.
     pub const GESTURE_DIRECTION_HORIZONTAL: ArkUI_GestureDirection = ArkUI_GestureDirection(3);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_GestureDirection {
     /// Vertical direction.
     pub const GESTURE_DIRECTION_VERTICAL: ArkUI_GestureDirection = ArkUI_GestureDirection(12);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_GestureDirection {
     /// Leftward.
     pub const GESTURE_DIRECTION_LEFT: ArkUI_GestureDirection = ArkUI_GestureDirection(1);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_GestureDirection {
     /// Rightward.
     pub const GESTURE_DIRECTION_RIGHT: ArkUI_GestureDirection = ArkUI_GestureDirection(2);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_GestureDirection {
     /// Upward.
     pub const GESTURE_DIRECTION_UP: ArkUI_GestureDirection = ArkUI_GestureDirection(4);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_GestureDirection {
     /// Downward.
     pub const GESTURE_DIRECTION_DOWN: ArkUI_GestureDirection = ArkUI_GestureDirection(8);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_GestureDirection {
     /// None.
     pub const GESTURE_DIRECTION_NONE: ArkUI_GestureDirection = ArkUI_GestureDirection(0);
 }
@@ -194,10 +138,6 @@ pub type ArkUI_GestureDirectionMask = u32;
 impl ArkUI_GestureMask {
     /// The gestures of child components are enabled and recognized based on the default gesture recognition sequence.
     pub const NORMAL_GESTURE_MASK: ArkUI_GestureMask = ArkUI_GestureMask(0);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_GestureMask {
     /// The gestures of child components are disabled, including the built-in gestures.
     pub const IGNORE_INTERNAL_GESTURE_MASK: ArkUI_GestureMask = ArkUI_GestureMask(1);
 }
@@ -215,40 +155,16 @@ pub struct ArkUI_GestureMask(pub ::core::ffi::c_uint);
 impl ArkUI_GestureRecognizerType {
     /// Tap.
     pub const TAP_GESTURE: ArkUI_GestureRecognizerType = ArkUI_GestureRecognizerType(0);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_GestureRecognizerType {
     /// Long press.
     pub const LONG_PRESS_GESTURE: ArkUI_GestureRecognizerType = ArkUI_GestureRecognizerType(1);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_GestureRecognizerType {
     /// Pan.
     pub const PAN_GESTURE: ArkUI_GestureRecognizerType = ArkUI_GestureRecognizerType(2);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_GestureRecognizerType {
     /// Pinch.
     pub const PINCH_GESTURE: ArkUI_GestureRecognizerType = ArkUI_GestureRecognizerType(3);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_GestureRecognizerType {
     /// Rotate.
     pub const ROTATION_GESTURE: ArkUI_GestureRecognizerType = ArkUI_GestureRecognizerType(4);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_GestureRecognizerType {
     /// Swipe.
     pub const SWIPE_GESTURE: ArkUI_GestureRecognizerType = ArkUI_GestureRecognizerType(5);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_GestureRecognizerType {
     /// A group of gestures.
     pub const GROUP_GESTURE: ArkUI_GestureRecognizerType = ArkUI_GestureRecognizerType(6);
 }
@@ -266,10 +182,6 @@ pub struct ArkUI_GestureRecognizerType(pub ::core::ffi::c_uint);
 impl ArkUI_GestureInterruptResult {
     /// The gesture recognition process continues.
     pub const CONTINUE: ArkUI_GestureInterruptResult = ArkUI_GestureInterruptResult(0);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_GestureInterruptResult {
     /// The gesture recognition process is paused.
     pub const REJECT: ArkUI_GestureInterruptResult = ArkUI_GestureInterruptResult(1);
 }
@@ -288,38 +200,18 @@ impl ArkUI_GestureRecognizerState {
     /// Ready.
     pub const ARKUI_GESTURE_RECOGNIZER_STATE_READY: ArkUI_GestureRecognizerState =
         ArkUI_GestureRecognizerState(0);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_GestureRecognizerState {
     /// Detecting.
     pub const ARKUI_GESTURE_RECOGNIZER_STATE_DETECTING: ArkUI_GestureRecognizerState =
         ArkUI_GestureRecognizerState(1);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_GestureRecognizerState {
     /// Pending.
     pub const ARKUI_GESTURE_RECOGNIZER_STATE_PENDING: ArkUI_GestureRecognizerState =
         ArkUI_GestureRecognizerState(2);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_GestureRecognizerState {
     /// Blocked.
     pub const ARKUI_GESTURE_RECOGNIZER_STATE_BLOCKED: ArkUI_GestureRecognizerState =
         ArkUI_GestureRecognizerState(3);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_GestureRecognizerState {
     /// Successful.
     pub const ARKUI_GESTURE_RECOGNIZER_STATE_SUCCESSFUL: ArkUI_GestureRecognizerState =
         ArkUI_GestureRecognizerState(4);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_GestureRecognizerState {
     /// Failed.
     pub const ARKUI_GESTURE_RECOGNIZER_STATE_FAILED: ArkUI_GestureRecognizerState =
         ArkUI_GestureRecognizerState(5);

components/arkui/src/native_interface/native_interface_ffi.rs

@@ -10,22 +10,10 @@ use crate::native_type::*;
 impl ArkUI_NativeAPIVariantKind {
     /// API related to UI components. For details, see the struct definition in <arkui/native_node.h>.
     pub const ARKUI_NATIVE_NODE: ArkUI_NativeAPIVariantKind = ArkUI_NativeAPIVariantKind(0);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_NativeAPIVariantKind {
     /// API related to dialog boxes. For details, see the struct definition in <arkui/native_dialog.h>.
     pub const ARKUI_NATIVE_DIALOG: ArkUI_NativeAPIVariantKind = ArkUI_NativeAPIVariantKind(1);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_NativeAPIVariantKind {
     /// API related to gestures. For details, see the struct definition in <arkui/native_gesture.h>.
     pub const ARKUI_NATIVE_GESTURE: ArkUI_NativeAPIVariantKind = ArkUI_NativeAPIVariantKind(2);
-}
-#[cfg(feature = "api-12")]
-#[cfg_attr(docsrs, doc(cfg(feature = "api-12")))]
-impl ArkUI_NativeAPIVariantKind {
     /// API related to animations. For details, see the struct definition in <arkui/native_animate.h>.
     pub const ARKUI_NATIVE_ANIMATE: ArkUI_NativeAPIVariantKind = ArkUI_NativeAPIVariantKind(3);
 }