commit 7109e74a7fc14f8f9c96a44e4dbced7855ca5eff
author Matthew Maurer <mmaurer@google.com> Tue Jan 07 21:08:46 2025 +0000
committer Matthew Maurer <mmaurer@google.com> Tue Jan 07 21:08:46 2025 +0000
tree e73c7143f454a9bfcabd063534711c9affd542f9
parent 4a93f96758b435b3ba81dce91dfde3def4199731

rust: crate_tool: Sort patches directory before using

Patches sometimes intentionally have `0001`, `0002`, etc. or other
alphabetization methods to indicate what order patches should be applied
in. Previously, we gathered up patches in directory-walk order, which
sometimes resulted in patches not applying.

Bug: 388276112
Test: ./crate_tool regenerate rustc-demangle-capi
Change-Id: Ic66b10024908a86dcf3ec13d0fb901333696966f

tools/external_crates/crate_tool/src/managed_crate.rs

diff --git a/tools/external_crates/crate_tool/src/managed_crate.rs b/tools/external_crates/crate_tool/src/managed_crate.rs
index 73fea88..1ec3897 100644
--- a/tools/external_crates/crate_tool/src/managed_crate.rs
+++ b/tools/external_crates/crate_tool/src/managed_crate.rs
@@ -131,6 +131,7 @@
                 patches.push(entry.path());
             }
         }
+        patches.sort();
 
         Ok(patches)
     }