From 72323e4a44b3cc9ce9c5266ce017efb1f127513b Mon Sep 17 00:00:00 2001
From: Jacob Birkett <jacob_birkett@fourier.earth>
Date: Sun, 29 Dec 2024 19:35:23 -0600
Subject: [PATCH] derive: use hygenic path for Result in output

This stops conflicts with too many generics when type
aliases of `Result` are in scope.
---
 derive/src/node.rs     | 16 ++++++++--------
 derive/src/scalar.rs   |  2 +-
 derive/src/variants.rs |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/derive/src/node.rs b/derive/src/node.rs
index 3603b5c..1f60d5f 100644
--- a/derive/src/node.rs
+++ b/derive/src/node.rs
@@ -94,7 +94,7 @@ pub fn emit_struct(s: &Struct, named: bool) -> syn::Result<TokenStream> {
                 fn insert_child(&mut self,
                     #node: &::knus::ast::SpannedNode<#span_ty>,
                     #ctx: &mut ::knus::decode::Context<#span_ty>)
-                    -> Result<bool, ::knus::errors::DecodeError<#span_ty>>
+                    -> ::std::result::Result<bool, ::knus::errors::DecodeError<#span_ty>>
                 {
                     #insert_child
                 }
@@ -102,7 +102,7 @@ pub fn emit_struct(s: &Struct, named: bool) -> syn::Result<TokenStream> {
                     #name: &::knus::span::Spanned<Box<str>, #span_ty>,
                     #value: &::knus::ast::Value<#span_ty>,
                     #ctx: &mut ::knus::decode::Context<#span_ty>)
-                    -> Result<bool, ::knus::errors::DecodeError<#span_ty>>
+                    -> ::std::result::Result<bool, ::knus::errors::DecodeError<#span_ty>>
                 {
                     #insert_property
                 }
@@ -124,7 +124,7 @@ pub fn emit_struct(s: &Struct, named: bool) -> syn::Result<TokenStream> {
                 fn decode_children(
                     #children: &[::knus::ast::SpannedNode<#span_ty>],
                     #ctx: &mut ::knus::decode::Context<#span_ty>)
-                    -> Result<Self, ::knus::errors::DecodeError<#span_ty>>
+                    -> ::std::result::Result<Self, ::knus::errors::DecodeError<#span_ty>>
                 {
                     #decode_children
                     #assign_extra
@@ -140,7 +140,7 @@ pub fn emit_struct(s: &Struct, named: bool) -> syn::Result<TokenStream> {
         {
             fn decode_node(#node: &::knus::ast::SpannedNode<#span_ty>,
                            #ctx: &mut ::knus::decode::Context<#span_ty>)
-                -> Result<Self, ::knus::errors::DecodeError<#span_ty>>
+                -> ::std::result::Result<Self, ::knus::errors::DecodeError<#span_ty>>
             {
                 #decode_specials
                 #decode_args
@@ -164,7 +164,7 @@ pub fn emit_new_type(s: &NewType) -> syn::Result<TokenStream> {
         {
             fn decode_node(#node: &::knus::ast::SpannedNode<S>,
                            #ctx: &mut ::knus::decode::Context<S>)
-                -> Result<Self, ::knus::errors::DecodeError<S>>
+                -> ::std::result::Result<Self, ::knus::errors::DecodeError<S>>
             {
                 if #node.arguments.len() > 0 ||
                     #node.properties.len() > 0 ||
@@ -433,7 +433,7 @@ fn decode_args(s: &Common, node: &syn::Ident) -> syn::Result<TokenStream> {
         decoder.push(quote! {
             let #fld = #iter_args.map(|#val| {
                 #decode_value
-            }).collect::<Result<_, _>>()?;
+            }).collect::<std::result::Result<_, _>>()?;
         });
     } else {
         decoder.push(quote! {
@@ -925,7 +925,7 @@ fn decode_children(
                 match &**#child.node_name {
                     #(#match_branches)*
                 }
-            }).collect::<Result<_, ::knus::errors::DecodeError<_>>>()?;
+            }).collect::<::std::result::Result<_, ::knus::errors::DecodeError<_>>>()?;
             #(#postprocess)*
         })
     } else {
@@ -945,7 +945,7 @@ fn decode_children(
                 match &**#child.node_name {
                     #(#match_branches)*
                 }
-            }).collect::<Result<(), ::knus::errors::DecodeError<_>>>()?;
+            }).collect::<::std::result::Result<(), ::knus::errors::DecodeError<_>>>()?;
             #(#postprocess)*
         })
     }
diff --git a/derive/src/scalar.rs b/derive/src/scalar.rs
index 84bc3aa..88f4d0c 100644
--- a/derive/src/scalar.rs
+++ b/derive/src/scalar.rs
@@ -99,7 +99,7 @@ pub fn emit_enum(e: &Enum) -> syn::Result<TokenStream> {
             fn raw_decode(val: &::knus::span::Spanned<
                           ::knus::ast::Literal, S>,
                           ctx: &mut ::knus::decode::Context<S>)
-                -> Result<#e_name, ::knus::errors::DecodeError<S>>
+                -> ::std::result::Result<#e_name, ::knus::errors::DecodeError<S>>
             {
                 match &**val {
                     ::knus::ast::Literal::String(ref s) => {
diff --git a/derive/src/variants.rs b/derive/src/variants.rs
index 35363a2..27ba9e9 100644
--- a/derive/src/variants.rs
+++ b/derive/src/variants.rs
@@ -48,7 +48,7 @@ pub fn emit_enum(e: &Enum) -> syn::Result<TokenStream> {
         {
             fn decode_node(#node: &::knus::ast::SpannedNode<#span_ty>,
                            #ctx: &mut ::knus::decode::Context<#span_ty>)
-                -> Result<Self, ::knus::errors::DecodeError<#span_ty>>
+                -> ::std::result::Result<Self, ::knus::errors::DecodeError<#span_ty>>
             {
                 #decode
             }