sort srcs in targets (#323)

bazeltools · Sep 24, 2024 · 8169f35 · 8169f35
1 parent cb840ca
commit 8169f35
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/crates/driver/src/print_build.rs b/crates/driver/src/print_build.rs
@@ -277,6 +277,9 @@ impl TargetEntry {
         ));
 
         for (k, v) in &self.extra_kv_pairs {
+            if k == "srcs" {
+              return Err(anyhow!("srcs cannot appear in extra_kv_pairs in: {}", self.name))
+            }
             let mut normv: Vec<MaybeLabel> = v.iter().map(|item| MaybeLabel::from_str(item)).collect();
             normv.sort();
 
@@ -348,12 +351,17 @@ impl SrcType {
                 )
             }
 
-            SrcType::List(files) => ast_builder::as_py_list(
-                files
-                    .iter()
-                    .map(|e| ast_builder::with_constant_str(e.clone()))
-                    .collect(),
-            ),
+            SrcType::List(files) => {
+              let mut srcs: Vec<MaybeLabel> =
+                files.iter().map(|src| MaybeLabel::from_str(&src)).collect();
+              srcs.sort();
+              ast_builder::as_py_list(
+                srcs
+                    .into_iter()
+                    .map(|e| e.to_expr())
+                    .collect()
+               )
+            }
         }
     }
 }

diff --git a/crates/python_utilities/src/ast_printer.rs b/crates/python_utilities/src/ast_printer.rs
@@ -323,7 +323,10 @@ mod tests {
 
 proto_library(
     name = "aa_proto",
-    srcs = ["aa.proto"],
+    srcs = [
+        "aa.proto",
+        "bb.proto",
+    ],
     deps = [
         "//x",
         "//y",