Skip to content

Commit 62ca460

Browse files
authored
Remove PREK_MAX_CONCURRENCY (#2620)
Removes the deprecated `PREK_MAX_CONCURRENCY` fallback.
1 parent e2468ea commit 62ca460

2 files changed

Lines changed: 8 additions & 42 deletions

File tree

‎crates/prek-consts/src/env_vars.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ impl EnvVars {
8989
pub const PREK_NO_CONCURRENCY: &'static str = "PREK_NO_CONCURRENCY";
9090
pub const PREK_CONCURRENT_HOOKS: &'static str = "PREK_CONCURRENT_HOOKS";
9191
pub const PREK_CONCURRENT_BATCHES: &'static str = "PREK_CONCURRENT_BATCHES";
92-
pub const PREK_MAX_CONCURRENCY: &'static str = "PREK_MAX_CONCURRENCY";
9392
pub const PREK_NO_FAST_PATH: &'static str = "PREK_NO_FAST_PATH";
9493
pub const PREK_UV_SOURCE: &'static str = "PREK_UV_SOURCE";
9594
pub const PREK_NATIVE_TLS: &'static str = "PREK_NATIVE_TLS";

‎crates/prek/src/run.rs‎

Lines changed: 8 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,16 @@ fn resolve_concurrency(env_vars: &impl EnvVarsRead, primary_env_var: &str) -> us
2323
return 1;
2424
}
2525

26-
let primary = env_vars.var(primary_env_var).ok();
27-
let legacy_max = env_vars.var(EnvVars::PREK_MAX_CONCURRENCY).ok();
28-
let (name, value) = if let Some(primary) = primary.as_deref() {
29-
(primary_env_var, Some(primary))
30-
} else {
31-
(EnvVars::PREK_MAX_CONCURRENCY, legacy_max.as_deref())
32-
};
33-
3426
let cpu = cpu_count();
35-
if let Some(value) = value {
36-
if let Ok(cap) = value.parse::<usize>() {
37-
return cap.max(1);
38-
}
39-
warn_user!(
40-
"Invalid value for {name}: {value:?}. Expected a positive integer; using default ({cpu})"
41-
);
27+
let Ok(value) = env_vars.var(primary_env_var) else {
28+
return cpu;
29+
};
30+
if let Ok(cap) = value.parse::<usize>() {
31+
return cap.max(1);
4232
}
33+
warn_user!(
34+
"Invalid value for {primary_env_var}: {value:?}. Expected a positive integer; using default ({cpu})"
35+
);
4336

4437
cpu
4538
}
@@ -474,39 +467,13 @@ mod tests {
474467
&[
475468
(EnvVars::PREK_NO_CONCURRENCY, "1"),
476469
(EnvVars::PREK_CONCURRENT_HOOKS, "8"),
477-
(EnvVars::PREK_MAX_CONCURRENCY, "4"),
478470
],
479471
EnvVars::PREK_CONCURRENT_HOOKS,
480472
),
481473
1
482474
);
483475
}
484476

485-
#[test]
486-
fn test_resolve_concurrency_uses_legacy_max() {
487-
assert_eq!(
488-
resolve_concurrency_from_map(
489-
&[(EnvVars::PREK_MAX_CONCURRENCY, "4")],
490-
EnvVars::PREK_CONCURRENT_HOOKS,
491-
),
492-
4
493-
);
494-
}
495-
496-
#[test]
497-
fn test_resolve_concurrency_prefers_new_env_over_legacy_max() {
498-
assert_eq!(
499-
resolve_concurrency_from_map(
500-
&[
501-
(EnvVars::PREK_CONCURRENT_BATCHES, "2"),
502-
(EnvVars::PREK_MAX_CONCURRENCY, "4"),
503-
],
504-
EnvVars::PREK_CONCURRENT_BATCHES,
505-
),
506-
2
507-
);
508-
}
509-
510477
#[test]
511478
fn test_partitions_respects_cli_length_limit() {
512479
// Create files that will exceed CLI length limit

0 commit comments

Comments
 (0)