From 8884ce5e6d15db04607d040aec41c0d982a64da0 Mon Sep 17 00:00:00 2001 From: nicholaslyang Date: Fri, 1 Sep 2023 15:55:21 -0400 Subject: [PATCH] Clippy fixes --- crates/turborepo-lib/src/hash/mod.rs | 8 ++++---- crates/turborepo-lib/src/run/global_hash.rs | 4 ++-- crates/turborepo-lib/src/task_graph/visitor.rs | 2 +- crates/turborepo-lib/src/task_hash.rs | 14 +++++++------- crates/turborepo-scm/src/package_deps.rs | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/crates/turborepo-lib/src/hash/mod.rs b/crates/turborepo-lib/src/hash/mod.rs index 8585590d6a682..60a5aed5d56cf 100644 --- a/crates/turborepo-lib/src/hash/mod.rs +++ b/crates/turborepo-lib/src/hash/mod.rs @@ -200,11 +200,11 @@ impl From> for Builder { ::capnp::message::TypedBuilder::::new_default(); let mut builder = message.init_root(); - builder.set_global_hash(&task_hashable.global_hash); + builder.set_global_hash(task_hashable.global_hash); builder.set_package_dir(&task_hashable.package_dir.to_string()); - builder.set_hash_of_files(&task_hashable.hash_of_files); + builder.set_hash_of_files(task_hashable.hash_of_files); builder.set_external_deps_hash(&task_hashable.external_deps_hash); - builder.set_task(&task_hashable.task); + builder.set_task(task_hashable.task); builder.set_env_mode(task_hashable.env_mode.into()); { @@ -290,7 +290,7 @@ impl<'a> From> for Builder { let mut builder = message.init_root(); - builder.set_global_cache_key(&hashable.global_cache_key); + builder.set_global_cache_key(hashable.global_cache_key); { let mut entries = builder diff --git a/crates/turborepo-lib/src/run/global_hash.rs b/crates/turborepo-lib/src/run/global_hash.rs index 2d5717c31153c..cb73defcdef9c 100644 --- a/crates/turborepo-lib/src/run/global_hash.rs +++ b/crates/turborepo-lib/src/run/global_hash.rs @@ -54,7 +54,7 @@ pub fn get_global_hash_inputs<'a, L: ?Sized + Lockfile>( dot_env: &'a [RelativeUnixPathBuf], ) -> Result> { let global_hashable_env_vars = - get_global_hashable_env_vars(env_at_execution_start, &global_env)?; + get_global_hashable_env_vars(env_at_execution_start, global_env)?; debug!( "global hash env vars {:?}", @@ -68,7 +68,7 @@ pub fn get_global_hash_inputs<'a, L: ?Sized + Lockfile>( let files = globwalk::globwalk( root_path, - &global_file_dependencies, + global_file_dependencies, &globs.raw_exclusions, WalkType::All, )?; diff --git a/crates/turborepo-lib/src/task_graph/visitor.rs b/crates/turborepo-lib/src/task_graph/visitor.rs index 40ccc58cc9e6e..6adb98cef8afa 100644 --- a/crates/turborepo-lib/src/task_graph/visitor.rs +++ b/crates/turborepo-lib/src/task_graph/visitor.rs @@ -130,7 +130,7 @@ impl<'a> Visitor<'a> { .task_hasher .calculate_task_hash( &info, - &task_definition, + task_definition, task_env_mode, workspace_info, dependency_set, diff --git a/crates/turborepo-lib/src/task_hash.rs b/crates/turborepo-lib/src/task_hash.rs index 468773049b43b..d48b9bf6c819e 100644 --- a/crates/turborepo-lib/src/task_hash.rs +++ b/crates/turborepo-lib/src/task_hash.rs @@ -29,7 +29,7 @@ pub enum Error { #[error("missing hash for dependent task {0}")] MissingDependencyTaskHash(String), #[error(transparent)] - SCM(#[from] turborepo_scm::Error), + Scm(#[from] turborepo_scm::Error), #[error(transparent)] Env(#[from] turborepo_env::Error), #[error(transparent)] @@ -82,7 +82,7 @@ impl PackageInputsHashes { } let task_definition = task_definitions - .get(&task_id) + .get(task_id) .ok_or_else(|| Error::MissingPipelineEntry(task_id.clone()))?; // TODO: Look into making WorkspaceName take a Cow @@ -113,7 +113,7 @@ impl PackageInputsHashes { .unwrap_or_else(|| AnchoredSystemPath::new("").unwrap()); let mut hash_object = scm.get_package_file_hashes( - &repo_root, + repo_root, package_path, &package_file_hash_inputs.task_definition.inputs, )?; @@ -146,7 +146,7 @@ impl PackageInputsHashes { } Ok(PackageInputsHashes { - hashes: hashes, + hashes, expanded_hashes: hash_objects, }) } @@ -266,7 +266,7 @@ impl<'a> TaskHasher<'a> { .env_at_execution_start .from_wildcards(&task_definition.env)?; - explicit_env_var_map.union(&mut all_env_var_map); + explicit_env_var_map.union(&all_env_var_map); } let env_vars = DetailedMap { @@ -278,7 +278,7 @@ impl<'a> TaskHasher<'a> { }; let hashable_env_pairs = env_vars.all.to_hashable(); - let outputs = task_definition.hashable_outputs(&task_id); + let outputs = task_definition.hashable_outputs(task_id); let task_dependency_hashes = self.calculate_dependency_hashes(dependency_set).await?; debug!( @@ -338,7 +338,7 @@ impl<'a> TaskHasher<'a> { let task_hash_tracker = self.task_hash_tracker.lock().await; let dependency_hash = task_hash_tracker .package_task_hashes - .get(&dependency_task_id) + .get(dependency_task_id) .ok_or_else(|| Error::MissingDependencyTaskHash(dependency_task.to_string()))?; dependency_hash_set.insert(dependency_hash.clone()); } diff --git a/crates/turborepo-scm/src/package_deps.rs b/crates/turborepo-scm/src/package_deps.rs index 250e3bde991f2..4604e823fcb07 100644 --- a/crates/turborepo-scm/src/package_deps.rs +++ b/crates/turborepo-scm/src/package_deps.rs @@ -16,9 +16,9 @@ impl SCM { allow_missing: bool, ) -> Result { if allow_missing { - self.hash_existing_of(&turbo_root, files.into_iter()) + self.hash_existing_of(turbo_root, files.iter()) } else { - self.hash_files(&turbo_root, files.into_iter()) + self.hash_files(turbo_root, files.iter()) } }