From 08afee00c9cf38dfe8a5cbb954b751ef3c3ee495 Mon Sep 17 00:00:00 2001
From: Andrew Lilley Brinker <alilleybrinker@gmail.com>
Date: Tue, 18 Nov 2025 09:57:45 -0800
Subject: [PATCH] Fully qualify std Result type

The prior macro expansion could produce errors if the macros were called in a context where `Result` is redefined, for example in a crate with its own `Result` type which pre-fills the error type. This replaces existing `Result` uses with `std::result::Result` to avoid the compilation error in that case.
---
 components/salsa-macro-rules/src/setup_input_struct.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/salsa-macro-rules/src/setup_input_struct.rs b/components/salsa-macro-rules/src/setup_input_struct.rs
index 741f9393e..837f5d3aa 100644
--- a/components/salsa-macro-rules/src/setup_input_struct.rs
+++ b/components/salsa-macro-rules/src/setup_input_struct.rs
@@ -123,7 +123,7 @@ macro_rules! setup_input_struct {
                 fn serialize<S: $zalsa::serde::Serializer>(
                     fields: &Self::Fields,
                     serializer: S,
-                ) -> Result<S::Ok, S::Error> {
+                ) -> std::result::Result<S::Ok, S::Error> {
                     $zalsa::macro_if! {
                         if $persist {
                             $($serialize_fn(fields, serializer))?
@@ -135,7 +135,7 @@ macro_rules! setup_input_struct {
 
                 fn deserialize<'de, D: $zalsa::serde::Deserializer<'de>>(
                     deserializer: D,
-                ) -> Result<Self::Fields, D::Error> {
+                ) -> std::result::Result<Self::Fields, D::Error> {
                     $zalsa::macro_if! {
                         if $persist {
                             $($deserialize_fn(deserializer))?
@@ -241,7 +241,7 @@ macro_rules! setup_input_struct {
 
             $zalsa::macro_if! { $persist =>
                 impl $zalsa::serde::Serialize for $Struct {
-                    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+                    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
                     where
                         S: $zalsa::serde::Serializer,
                     {
@@ -250,7 +250,7 @@ macro_rules! setup_input_struct {
                 }
 
                 impl<'de> $zalsa::serde::Deserialize<'de> for $Struct {
-                    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+                    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
                     where
                         D: $zalsa::serde::Deserializer<'de>,
                     {