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.

Sign up for GitHub

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

Derive Copy, Clone, and Debug for handles #3015

Merged
merged 2 commits into from
May 3, 2024
+504 −5,976
Merged

Derive Copy, Clone, and Debug for handles #3015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a67eb5
bindgen
kennykerr May 2, 2024
8f4471e
code gen
kennykerr May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 1 addition & 12 deletions crates/libs/bindgen/src/rust/handles.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ pub fn gen_win_handle(writer: &Writer, def: metadata::TypeDef) -> TokenStream {

let mut tokens = quote! {
#[repr(transparent)]
#[derive(PartialEq, Eq)]
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
pub struct #ident(pub #signature);
#is_invalid
#free
Expand All @@ -109,17 +109,6 @@ pub fn gen_win_handle(writer: &Writer, def: metadata::TypeDef) -> TokenStream {
unsafe { core::mem::zeroed() }
}
}
impl Clone for #ident {
fn clone(&self) -> Self {
*self
}
}
impl Copy for #ident {}
impl core::fmt::Debug for #ident {
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
f.debug_tuple(#name).field(&self.0).finish()
}
}
impl windows_core::TypeKind for #ident {
type TypeKind = windows_core::CopyType;
}
Expand Down
7 changes: 1 addition & 6 deletions crates/libs/bindgen/src/rust/standalone.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,18 +64,13 @@ pub fn standalone_imp(writer: &Writer) -> String {
"GUID",
quote! {
#[repr(C)]
#[derive(Clone, Copy)]
pub struct GUID {
pub data1: u32,
pub data2: u16,
pub data3: u16,
pub data4: [u8; 8],
}
impl Copy for GUID {}
impl Clone for GUID {
fn clone(&self) -> Self {
*self
}
}
impl GUID {
pub const fn from_u128(uuid: u128) -> Self {
Self { data1: (uuid >> 96) as u32, data2: (uuid >> 80 & 0xffff) as u16, data3: (uuid >> 64 & 0xffff) as u16, data4: (uuid as u64).to_be_bytes() }
Expand Down
7 changes: 1 addition & 6 deletions crates/libs/core/src/imp/bindings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,18 +516,13 @@ impl Clone for FUNCDESC {
pub type FUNCFLAGS = u16;
pub type FUNCKIND = i32;
#[repr(C)]
#[derive(Clone, Copy)]
pub struct GUID {
pub data1: u32,
pub data2: u16,
pub data3: u16,
pub data4: [u8; 8],
}
impl Copy for GUID {}
impl Clone for GUID {
fn clone(&self) -> Self {
*self
}
}
impl GUID {
pub const fn from_u128(uuid: u128) -> Self {
Self { data1: (uuid >> 96) as u32, data2: (uuid >> 80 & 0xffff) as u16, data3: (uuid >> 64 & 0xffff) as u16, data4: (uuid as u64).to_be_bytes() }
Expand Down
7 changes: 1 addition & 6 deletions crates/libs/result/src/bindings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,13 @@ pub const FORMAT_MESSAGE_FROM_SYSTEM: FORMAT_MESSAGE_OPTIONS = 4096u32;
pub const FORMAT_MESSAGE_IGNORE_INSERTS: FORMAT_MESSAGE_OPTIONS = 512u32;
pub type FORMAT_MESSAGE_OPTIONS = u32;
#[repr(C)]
#[derive(Clone, Copy)]
pub struct GUID {
pub data1: u32,
pub data2: u16,
pub data3: u16,
pub data4: [u8; 8],
}
impl Copy for GUID {}
impl Clone for GUID {
fn clone(&self) -> Self {
*self
}
}
impl GUID {
pub const fn from_u128(uuid: u128) -> Self {
Self {
Expand Down
Loading
Loading