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

Simplify trait bounds for interface implementations #3227

Merged
merged 3 commits into from
Aug 27, 2024
Merged

Simplify trait bounds for interface implementations #3227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1eb4310
Simplify trait bounds for interface implementations
kennykerr Aug 27, 2024
3ee64ee
generated code
kennykerr Aug 27, 2024
f06da25
revert all
kennykerr Aug 27, 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
12 changes: 5 additions & 7 deletions crates/libs/bindgen/src/rust/implements.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ pub fn writer(writer: &Writer, def: metadata::TypeDef) -> TokenStream {
let mut matches = quote! { iid == &<#type_ident as windows_core::Interface>::IID };

if let Some(metadata::Type::TypeDef(def, _)) = vtables.last() {
requires.combine(&gen_required_trait(writer, *def, &[]))
requires.combine(&gen_required_trait(writer, *def, &[]));
} else if has_unknown_base {
requires.combine(&quote! { + windows_core::IUnknownImpl });
}

for def in &vtables {
Expand Down Expand Up @@ -99,11 +101,9 @@ pub fn writer(writer: &Writer, def: metadata::TypeDef) -> TokenStream {
quote! {
unsafe extern "system" fn #name<
#constraints
Identity: windows_core::IUnknownImpl,
Identity: #impl_ident<#generic_names>,
const OFFSET: isize
> #vtbl_signature
where
Identity: #impl_ident<#generic_names>
{
// offset the `this` pointer by `OFFSET` times the size of a pointer and cast it as an IUnknown implementation
let this: &Identity = &*((this as *const *const ()).offset(OFFSET) as *const Identity);
Expand Down Expand Up @@ -158,11 +158,9 @@ pub fn writer(writer: &Writer, def: metadata::TypeDef) -> TokenStream {
#features
impl<#constraints> #vtbl_ident<#generic_names> {
pub const fn new<
Identity: windows_core::IUnknownImpl,
Identity: #impl_ident<#generic_names>,
const OFFSET: isize
>() -> #vtbl_ident<#generic_names>
where
Identity : #impl_ident<#generic_names>
{
#(#method_impls)*
Self{
Expand Down
63 changes: 15 additions & 48 deletions crates/libs/windows/src/Windows/AI/MachineLearning/impl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pub trait ILearningModelFeatureDescriptor_Impl: Sized {
pub trait ILearningModelFeatureDescriptor_Impl: Sized + windows_core::IUnknownImpl {
fn Name(&self) -> windows_core::Result<windows_core::HSTRING>;
fn Description(&self) -> windows_core::Result<windows_core::HSTRING>;
fn Kind(&self) -> windows_core::Result<LearningModelFeatureKind>;
Expand All @@ -8,14 +8,8 @@ impl windows_core::RuntimeName for ILearningModelFeatureDescriptor {
const NAME: &'static str = "Windows.AI.MachineLearning.ILearningModelFeatureDescriptor";
}
impl ILearningModelFeatureDescriptor_Vtbl {
pub const fn new<Identity: windows_core::IUnknownImpl, const OFFSET: isize>() -> ILearningModelFeatureDescriptor_Vtbl
where
Identity: ILearningModelFeatureDescriptor_Impl,
{
unsafe extern "system" fn Name<Identity: windows_core::IUnknownImpl, const OFFSET: isize>(this: *mut core::ffi::c_void, result__: *mut core::mem::MaybeUninit<windows_core::HSTRING>) -> windows_core::HRESULT
where
Identity: ILearningModelFeatureDescriptor_Impl,
{
pub const fn new<Identity: ILearningModelFeatureDescriptor_Impl, const OFFSET: isize>() -> ILearningModelFeatureDescriptor_Vtbl {
unsafe extern "system" fn Name<Identity: ILearningModelFeatureDescriptor_Impl, const OFFSET: isize>(this: *mut core::ffi::c_void, result__: *mut core::mem::MaybeUninit<windows_core::HSTRING>) -> windows_core::HRESULT {
let this: &Identity = &*((this as *const *const ()).offset(OFFSET) as *const Identity);
match ILearningModelFeatureDescriptor_Impl::Name(this) {
Ok(ok__) => {
Expand All @@ -26,10 +20,7 @@ impl ILearningModelFeatureDescriptor_Vtbl {
Err(err) => err.into(),
}
}
unsafe extern "system" fn Description<Identity: windows_core::IUnknownImpl, const OFFSET: isize>(this: *mut core::ffi::c_void, result__: *mut core::mem::MaybeUninit<windows_core::HSTRING>) -> windows_core::HRESULT
where
Identity: ILearningModelFeatureDescriptor_Impl,
{
unsafe extern "system" fn Description<Identity: ILearningModelFeatureDescriptor_Impl, const OFFSET: isize>(this: *mut core::ffi::c_void, result__: *mut core::mem::MaybeUninit<windows_core::HSTRING>) -> windows_core::HRESULT {
let this: &Identity = &*((this as *const *const ()).offset(OFFSET) as *const Identity);
match ILearningModelFeatureDescriptor_Impl::Description(this) {
Ok(ok__) => {
Expand All @@ -40,10 +31,7 @@ impl ILearningModelFeatureDescriptor_Vtbl {
Err(err) => err.into(),
}
}
unsafe extern "system" fn Kind<Identity: windows_core::IUnknownImpl, const OFFSET: isize>(this: *mut core::ffi::c_void, result__: *mut LearningModelFeatureKind) -> windows_core::HRESULT
where
Identity: ILearningModelFeatureDescriptor_Impl,
{
unsafe extern "system" fn Kind<Identity: ILearningModelFeatureDescriptor_Impl, const OFFSET: isize>(this: *mut core::ffi::c_void, result__: *mut LearningModelFeatureKind) -> windows_core::HRESULT {
let this: &Identity = &*((this as *const *const ()).offset(OFFSET) as *const Identity);
match ILearningModelFeatureDescriptor_Impl::Kind(this) {
Ok(ok__) => {
Expand All @@ -53,10 +41,7 @@ impl ILearningModelFeatureDescriptor_Vtbl {
Err(err) => err.into(),
}
}
unsafe extern "system" fn IsRequired<Identity: windows_core::IUnknownImpl, const OFFSET: isize>(this: *mut core::ffi::c_void, result__: *mut bool) -> windows_core::HRESULT
where
Identity: ILearningModelFeatureDescriptor_Impl,
{
unsafe extern "system" fn IsRequired<Identity: ILearningModelFeatureDescriptor_Impl, const OFFSET: isize>(this: *mut core::ffi::c_void, result__: *mut bool) -> windows_core::HRESULT {
let this: &Identity = &*((this as *const *const ()).offset(OFFSET) as *const Identity);
match ILearningModelFeatureDescriptor_Impl::IsRequired(this) {
Ok(ok__) => {
Expand All @@ -78,21 +63,15 @@ impl ILearningModelFeatureDescriptor_Vtbl {
iid == &<ILearningModelFeatureDescriptor as windows_core::Interface>::IID
}
}
pub trait ILearningModelFeatureValue_Impl: Sized {
pub trait ILearningModelFeatureValue_Impl: Sized + windows_core::IUnknownImpl {
fn Kind(&self) -> windows_core::Result<LearningModelFeatureKind>;
}
impl windows_core::RuntimeName for ILearningModelFeatureValue {
const NAME: &'static str = "Windows.AI.MachineLearning.ILearningModelFeatureValue";
}
impl ILearningModelFeatureValue_Vtbl {
pub const fn new<Identity: windows_core::IUnknownImpl, const OFFSET: isize>() -> ILearningModelFeatureValue_Vtbl
where
Identity: ILearningModelFeatureValue_Impl,
{
unsafe extern "system" fn Kind<Identity: windows_core::IUnknownImpl, const OFFSET: isize>(this: *mut core::ffi::c_void, result__: *mut LearningModelFeatureKind) -> windows_core::HRESULT
where
Identity: ILearningModelFeatureValue_Impl,
{
pub const fn new<Identity: ILearningModelFeatureValue_Impl, const OFFSET: isize>() -> ILearningModelFeatureValue_Vtbl {
unsafe extern "system" fn Kind<Identity: ILearningModelFeatureValue_Impl, const OFFSET: isize>(this: *mut core::ffi::c_void, result__: *mut LearningModelFeatureKind) -> windows_core::HRESULT {
let this: &Identity = &*((this as *const *const ()).offset(OFFSET) as *const Identity);
match ILearningModelFeatureValue_Impl::Kind(this) {
Ok(ok__) => {
Expand All @@ -108,23 +87,20 @@ impl ILearningModelFeatureValue_Vtbl {
iid == &<ILearningModelFeatureValue as windows_core::Interface>::IID
}
}
pub trait ILearningModelOperatorProvider_Impl: Sized {}
pub trait ILearningModelOperatorProvider_Impl: Sized + windows_core::IUnknownImpl {}
impl windows_core::RuntimeName for ILearningModelOperatorProvider {
const NAME: &'static str = "Windows.AI.MachineLearning.ILearningModelOperatorProvider";
}
impl ILearningModelOperatorProvider_Vtbl {
pub const fn new<Identity: windows_core::IUnknownImpl, const OFFSET: isize>() -> ILearningModelOperatorProvider_Vtbl
where
Identity: ILearningModelOperatorProvider_Impl,
{
pub const fn new<Identity: ILearningModelOperatorProvider_Impl, const OFFSET: isize>() -> ILearningModelOperatorProvider_Vtbl {
Self { base__: windows_core::IInspectable_Vtbl::new::<Identity, ILearningModelOperatorProvider, OFFSET>() }
}
pub fn matches(iid: &windows_core::GUID) -> bool {
iid == &<ILearningModelOperatorProvider as windows_core::Interface>::IID
}
}
#[cfg(feature = "Foundation_Collections")]
pub trait ITensor_Impl: Sized + ILearningModelFeatureValue_Impl {
pub trait ITensor_Impl: Sized + windows_core::IUnknownImpl + ILearningModelFeatureValue_Impl {
fn TensorKind(&self) -> windows_core::Result<TensorKind>;
fn Shape(&self) -> windows_core::Result<super::super::Foundation::Collections::IVectorView<i64>>;
}
Expand All @@ -134,14 +110,8 @@ impl windows_core::RuntimeName for ITensor {
}
#[cfg(feature = "Foundation_Collections")]
impl ITensor_Vtbl {
pub const fn new<Identity: windows_core::IUnknownImpl, const OFFSET: isize>() -> ITensor_Vtbl
where
Identity: ITensor_Impl,
{
unsafe extern "system" fn TensorKind<Identity: windows_core::IUnknownImpl, const OFFSET: isize>(this: *mut core::ffi::c_void, result__: *mut TensorKind) -> windows_core::HRESULT
where
Identity: ITensor_Impl,
{
pub const fn new<Identity: ITensor_Impl, const OFFSET: isize>() -> ITensor_Vtbl {
unsafe extern "system" fn TensorKind<Identity: ITensor_Impl, const OFFSET: isize>(this: *mut core::ffi::c_void, result__: *mut TensorKind) -> windows_core::HRESULT {
let this: &Identity = &*((this as *const *const ()).offset(OFFSET) as *const Identity);
match ITensor_Impl::TensorKind(this) {
Ok(ok__) => {
Expand All @@ -151,10 +121,7 @@ impl ITensor_Vtbl {
Err(err) => err.into(),
}
}
unsafe extern "system" fn Shape<Identity: windows_core::IUnknownImpl, const OFFSET: isize>(this: *mut core::ffi::c_void, result__: *mut *mut core::ffi::c_void) -> windows_core::HRESULT
where
Identity: ITensor_Impl,
{
unsafe extern "system" fn Shape<Identity: ITensor_Impl, const OFFSET: isize>(this: *mut core::ffi::c_void, result__: *mut *mut core::ffi::c_void) -> windows_core::HRESULT {
let this: &Identity = &*((this as *const *const ()).offset(OFFSET) as *const Identity);
match ITensor_Impl::Shape(this) {
Ok(ok__) => {
Expand Down
Loading