Merge pull request #25 from bobrik/ivan/deterministic

Make conflict order deterministic

Author: ModProg

CHANGELOG.md

@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Fixed
+- fix nondeterminism in order of conflicting fields
 
 ## [0.10.3] - 2024-11-17
 ### Fixed

macro/src/lib.rs

@@ -460,7 +460,12 @@ impl Conflicts {
     }
 
     fn to_tokens(&self, struct_error: &StructError) -> Result<TokenStream> {
-        self.0
+        let mut conflicts = self.0.iter().collect::<Vec<_>>();
+
+        // The order must be deterministic to be friendly to tools like sccache
+        conflicts.sort();
+
+        conflicts
             .iter()
             .map(|(a, b)| {
                 let af = Formattable::display(&a);