From 174e9e86f6639ea8dd9f08eefe15b937ee5e3905 Mon Sep 17 00:00:00 2001
From: Paskal Sitepu <rmnscnce@ya.ru>
Date: Wed, 12 Apr 2023 22:32:51 +0700
Subject: [PATCH] glib-macros: Disambiguate TryFrom<usize>::Error for
 DerivedPropertiesEnum

This should allow structs with a property named "error" to compile successfully
---
 glib-macros/src/properties.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/glib-macros/src/properties.rs b/glib-macros/src/properties.rs
index af82b6da2cb6..e6a3e70c9504 100644
--- a/glib-macros/src/properties.rs
+++ b/glib-macros/src/properties.rs
@@ -620,7 +620,7 @@ fn expand_properties_enum(props: &[PropDesc]) -> TokenStream2 {
         impl std::convert::TryFrom<usize> for DerivedPropertiesEnum {
             type Error = usize;
 
-            fn try_from(item: usize) -> ::core::result::Result<Self, Self::Error> {
+            fn try_from(item: usize) -> ::core::result::Result<Self, <Self as std::convert::TryFrom<usize>>::Error> {
                 match item {
                     #(#indices => ::core::result::Result::Ok(Self::#properties),)*
                     _ => ::core::result::Result::Err(item)