Fix CI

vercel · Feb 5, 2025 · 42cef36 · 42cef36
1 parent a35aabe
commit 42cef36
Show file tree

Hide file tree

Showing 3 changed files with 77 additions and 62 deletions.
diff --git a/crates/turborepo-lib/src/boundaries/mod.rs b/crates/turborepo-lib/src/boundaries/mod.rs
@@ -389,6 +389,7 @@ impl Run {
 
     /// Either returns a list of errors and number of files checked or a single,
     /// fatal error
+    #[allow(clippy::too_many_arguments)]
     async fn check_package(
         &self,
         repo: &Option<Mutex<Repository>>,

diff --git a/crates/turborepo-lib/src/engine/builder.rs b/crates/turborepo-lib/src/engine/builder.rs
@@ -198,7 +198,7 @@ impl<'a> EngineBuilder<'a> {
             return Ok(Engine::default().seal());
         }
 
-        let mut turbo_json_loader = self
+        let turbo_json_loader = self
             .turbo_json_loader
             .take()
             .expect("engine builder cannot be constructed without TurboJsonLoader");
@@ -239,7 +239,7 @@ impl<'a> EngineBuilder<'a> {
                 .task_id()
                 .unwrap_or_else(|| TaskId::new(workspace.as_ref(), task.task()));
 
-            if Self::has_task_definition(&mut turbo_json_loader, workspace, task, &task_id)? {
+            if Self::has_task_definition(turbo_json_loader, workspace, task, &task_id)? {
                 missing_tasks.remove(task.as_inner());
 
                 // Even if a task definition was found, we _only_ want to add it as an entry
@@ -335,7 +335,7 @@ impl<'a> EngineBuilder<'a> {
             }
 
             let task_definition = self.task_definition(
-                &mut turbo_json_loader,
+                turbo_json_loader,
                 &task_id,
                 &task_id.as_non_workspace_task_name(),
             )?;
@@ -825,8 +825,8 @@ mod test {
         )]
         .into_iter()
         .collect();
-        let loader = TurboJsonLoader::noop(turbo_jsons);
-        let engine = EngineBuilder::new(&repo_root, &package_graph, loader, false)
+        let mut loader = TurboJsonLoader::noop(turbo_jsons);
+        let engine = EngineBuilder::new(&repo_root, &package_graph, &mut loader, false)
             .with_tasks(Some(Spanned::new(TaskName::from("test"))))
             .with_workspaces(vec![
                 PackageName::from("a"),
@@ -882,8 +882,8 @@ mod test {
         )]
         .into_iter()
         .collect();
-        let loader = TurboJsonLoader::noop(turbo_jsons);
-        let engine = EngineBuilder::new(&repo_root, &package_graph, loader, false)
+        let mut loader = TurboJsonLoader::noop(turbo_jsons);
+        let engine = EngineBuilder::new(&repo_root, &package_graph, &mut loader, false)
             .with_tasks(Some(Spanned::new(TaskName::from("test"))))
             .with_workspaces(vec![PackageName::from("app2")])
             .build()
@@ -921,8 +921,8 @@ mod test {
         )]
         .into_iter()
         .collect();
-        let loader = TurboJsonLoader::noop(turbo_jsons);
-        let engine = EngineBuilder::new(&repo_root, &package_graph, loader, false)
+        let mut loader = TurboJsonLoader::noop(turbo_jsons);
+        let engine = EngineBuilder::new(&repo_root, &package_graph, &mut loader, false)
             .with_tasks(Some(Spanned::new(TaskName::from("special"))))
             .with_workspaces(vec![PackageName::from("app1"), PackageName::from("libA")])
             .build()
@@ -959,8 +959,8 @@ mod test {
         )]
         .into_iter()
         .collect();
-        let loader = TurboJsonLoader::noop(turbo_jsons);
-        let engine = EngineBuilder::new(&repo_root, &package_graph, loader, false)
+        let mut loader = TurboJsonLoader::noop(turbo_jsons);
+        let engine = EngineBuilder::new(&repo_root, &package_graph, &mut loader, false)
             .with_tasks(vec![
                 Spanned::new(TaskName::from("build")),
                 Spanned::new(TaskName::from("test")),
@@ -1012,8 +1012,8 @@ mod test {
         )]
         .into_iter()
         .collect();
-        let loader = TurboJsonLoader::noop(turbo_jsons);
-        let engine = EngineBuilder::new(&repo_root, &package_graph, loader, false)
+        let mut loader = TurboJsonLoader::noop(turbo_jsons);
+        let engine = EngineBuilder::new(&repo_root, &package_graph, &mut loader, false)
             .with_tasks(Some(Spanned::new(TaskName::from("build"))))
             .with_workspaces(vec![PackageName::from("app1")])
             .with_root_tasks(vec![
@@ -1055,8 +1055,8 @@ mod test {
         )]
         .into_iter()
         .collect();
-        let loader = TurboJsonLoader::noop(turbo_jsons);
-        let engine = EngineBuilder::new(&repo_root, &package_graph, loader, false)
+        let mut loader = TurboJsonLoader::noop(turbo_jsons);
+        let engine = EngineBuilder::new(&repo_root, &package_graph, &mut loader, false)
             .with_tasks(Some(Spanned::new(TaskName::from("build"))))
             .with_workspaces(vec![PackageName::from("app1")])
             .with_root_tasks(vec![TaskName::from("libA#build"), TaskName::from("build")])
@@ -1090,8 +1090,8 @@ mod test {
         )]
         .into_iter()
         .collect();
-        let loader = TurboJsonLoader::noop(turbo_jsons);
-        let engine = EngineBuilder::new(&repo_root, &package_graph, loader, false)
+        let mut loader = TurboJsonLoader::noop(turbo_jsons);
+        let engine = EngineBuilder::new(&repo_root, &package_graph, &mut loader, false)
             .with_tasks(Some(Spanned::new(TaskName::from("build"))))
             .with_workspaces(vec![PackageName::from("app1")])
             .with_root_tasks(vec![
@@ -1135,8 +1135,8 @@ mod test {
         )]
         .into_iter()
         .collect();
-        let loader = TurboJsonLoader::noop(turbo_jsons);
-        let engine = EngineBuilder::new(&repo_root, &package_graph, loader, false)
+        let mut loader = TurboJsonLoader::noop(turbo_jsons);
+        let engine = EngineBuilder::new(&repo_root, &package_graph, &mut loader, false)
             .with_tasks(Some(Spanned::new(TaskName::from("build"))))
             .with_workspaces(vec![PackageName::from("app1")])
             .with_root_tasks(vec![
@@ -1174,8 +1174,8 @@ mod test {
         )]
         .into_iter()
         .collect();
-        let loader = TurboJsonLoader::noop(turbo_jsons);
-        let engine = EngineBuilder::new(&repo_root, &package_graph, loader, false)
+        let mut loader = TurboJsonLoader::noop(turbo_jsons);
+        let engine = EngineBuilder::new(&repo_root, &package_graph, &mut loader, false)
             .with_tasks_only(true)
             .with_tasks(Some(Spanned::new(TaskName::from("test"))))
             .with_workspaces(vec![
@@ -1221,8 +1221,8 @@ mod test {
         )]
         .into_iter()
         .collect();
-        let loader = TurboJsonLoader::noop(turbo_jsons);
-        let engine = EngineBuilder::new(&repo_root, &package_graph, loader, false)
+        let mut loader = TurboJsonLoader::noop(turbo_jsons);
+        let engine = EngineBuilder::new(&repo_root, &package_graph, &mut loader, false)
             .with_tasks_only(true)
             .with_tasks(Some(Spanned::new(TaskName::from("build"))))
             .with_workspaces(vec![PackageName::from("b")])
@@ -1260,8 +1260,8 @@ mod test {
         )]
         .into_iter()
         .collect();
-        let loader = TurboJsonLoader::noop(turbo_jsons);
-        let engine = EngineBuilder::new(&repo_root, &package_graph, loader, false)
+        let mut loader = TurboJsonLoader::noop(turbo_jsons);
+        let engine = EngineBuilder::new(&repo_root, &package_graph, &mut loader, false)
             .with_tasks_only(true)
             .with_tasks(Some(Spanned::new(TaskName::from("build"))))
             .with_workspaces(vec![PackageName::from("b")])
@@ -1328,8 +1328,8 @@ mod test {
         ]
         .into_iter()
         .collect();
-        let loader = TurboJsonLoader::noop(turbo_jsons);
-        let engine = EngineBuilder::new(&repo_root, &package_graph, loader, false)
+        let mut loader = TurboJsonLoader::noop(turbo_jsons);
+        let engine = EngineBuilder::new(&repo_root, &package_graph, &mut loader, false)
             .with_tasks(vec![
                 Spanned::new(TaskName::from("app1#special")),
                 Spanned::new(TaskName::from("app2#another")),
@@ -1370,8 +1370,8 @@ mod test {
         })]
         .into_iter()
         .collect();
-        let loader = TurboJsonLoader::noop(turbo_jsons);
-        let engine = EngineBuilder::new(&repo_root, &package_graph, loader, false)
+        let mut loader = TurboJsonLoader::noop(turbo_jsons);
+        let engine = EngineBuilder::new(&repo_root, &package_graph, &mut loader, false)
             .with_tasks(Some(Spanned::new(TaskName::from("dev"))))
             .with_workspaces(vec![PackageName::from("web")])
             .build()
@@ -1417,8 +1417,8 @@ mod test {
         ]
         .into_iter()
         .collect();
-        let loader = TurboJsonLoader::noop(turbo_jsons);
-        let engine = EngineBuilder::new(&repo_root, &package_graph, loader.clone(), false)
+        let mut loader = TurboJsonLoader::noop(turbo_jsons);
+        let engine = EngineBuilder::new(&repo_root, &package_graph, &mut loader, false)
             .with_tasks(vec![Spanned::new(TaskName::from("app1#special"))])
             .with_workspaces(vec![PackageName::from("app1")])
             .build();
@@ -1430,7 +1430,7 @@ mod test {
             .unwrap();
         assert_json_snapshot!(msg);
 
-        let engine = EngineBuilder::new(&repo_root, &package_graph, loader, false)
+        let engine = EngineBuilder::new(&repo_root, &package_graph, &mut loader, false)
             .with_tasks(vec![Spanned::new(TaskName::from("app1#another"))])
             .with_workspaces(vec![PackageName::from("libA")])
             .build();
@@ -1465,8 +1465,8 @@ mod test {
         )]
         .into_iter()
         .collect();
-        let loader = TurboJsonLoader::noop(turbo_jsons);
-        let engine = EngineBuilder::new(&repo_root, &package_graph, loader.clone(), false)
+        let mut loader = TurboJsonLoader::noop(turbo_jsons);
+        let engine = EngineBuilder::new(&repo_root, &package_graph, &mut loader, false)
             .with_tasks(vec![Spanned::new(TaskName::from("app2#bad-task"))])
             .with_workspaces(vec![PackageName::from("app1"), PackageName::from("libA")])
             .build();

diff --git a/crates/turborepo-lib/src/turbo_json/parser.rs b/crates/turborepo-lib/src/turbo_json/parser.rs
@@ -105,9 +105,9 @@ impl WithMetadata for RawTurboJson {
         self.global_env.add_text(text.clone());
         self.global_pass_through_env.add_text(text.clone());
         self.boundaries.add_text(text.clone());
-        self.boundaries
-            .as_mut()
-            .map(|boundaries| boundaries.value.add_text(text.clone()));
+        if let Some(boundaries) = &mut self.boundaries {
+            boundaries.value.add_text(text.clone());
+        }
 
         self.tasks.add_text(text.clone());
         self.cache_dir.add_text(text.clone());
@@ -121,9 +121,9 @@ impl WithMetadata for RawTurboJson {
         self.global_env.add_path(path.clone());
         self.global_pass_through_env.add_path(path.clone());
         self.boundaries.add_path(path.clone());
-        self.boundaries
-            .as_mut()
-            .map(|boundaries| boundaries.value.add_path(path.clone()));
+        if let Some(boundaries) = &mut self.boundaries {
+            boundaries.value.add_path(path.clone());
+        }
         self.tasks.add_path(path.clone());
         self.cache_dir.add_path(path.clone());
         self.pipeline.add_path(path);
@@ -149,48 +149,62 @@ impl WithMetadata for Pipeline {
 impl WithMetadata for BoundariesConfig {
     fn add_text(&mut self, text: Arc<str>) {
         self.tags.add_text(text.clone());
-        self.tags
-            .as_mut()
-            .map(|tags| tags.value.add_text(text.clone()));
+        if let Some(tags) = &mut self.tags {
+            tags.value.add_text(text.clone());
+        }
+
         self.dependencies.add_text(text.clone());
-        self.dependencies
-            .as_mut()
-            .map(|dependencies| dependencies.value.add_text(text.clone()));
+        if let Some(dependencies) = &mut self.dependencies {
+            dependencies.value.add_text(text.clone());
+        }
+
         self.dependents.add_text(text.clone());
-        self.dependents
-            .as_mut()
-            .map(|dependents| dependents.value.add_text(text.clone()));
+        if let Some(dependents) = &mut self.dependents {
+            dependents.value.add_text(text.clone());
+        }
     }
 
     fn add_path(&mut self, path: Arc<str>) {
         self.tags.add_path(path.clone());
-        self.tags
-            .as_mut()
-            .map(|tags| tags.value.add_path(path.clone()));
+        if let Some(tags) = &mut self.tags {
+            tags.value.add_path(path.clone());
+        }
+
         self.dependencies.add_path(path.clone());
-        self.dependencies
-            .as_mut()
-            .map(|dependencies| dependencies.value.add_path(path.clone()));
+        if let Some(dependencies) = &mut self.dependencies {
+            dependencies.value.add_path(path.clone());
+        }
+
         self.dependents.add_path(path.clone());
-        self.dependents
-            .as_mut()
-            .map(|dependents| dependents.value.add_path(path.clone()));
+        if let Some(dependents) = &mut self.dependents {
+            dependents.value.add_path(path);
+        }
     }
 }
 
 impl WithMetadata for Permissions {
     fn add_text(&mut self, text: Arc<str>) {
         self.allow.add_text(text.clone());
-        self.allow.as_mut().map(|s| s.value.add_text(text.clone()));
+        if let Some(allow) = &mut self.allow {
+            allow.value.add_text(text.clone());
+        }
+
         self.deny.add_text(text.clone());
-        self.deny.as_mut().map(|s| s.value.add_text(text));
+        if let Some(deny) = &mut self.deny {
+            deny.value.add_text(text.clone());
+        }
     }
 
     fn add_path(&mut self, path: Arc<str>) {
         self.allow.add_path(path.clone());
-        self.allow.as_mut().map(|s| s.value.add_path(path.clone()));
+        if let Some(allow) = &mut self.allow {
+            allow.value.add_path(path.clone());
+        }
+
         self.deny.add_path(path.clone());
-        self.deny.as_mut().map(|s| s.value.add_path(path));
+        if let Some(deny) = &mut self.deny {
+            deny.value.add_path(path.clone());
+        }
     }
 }