Skip to content

Commit e888329

Browse files
Remove unreachable lock configuration sources (#21409)
`LockedSource` and `FrozenSource` include workspace configuration cases even though neither mode supports configuration values. Remove those unreachable variants and resolve the CLI and environment sources directly. This also removes the unused configuration branches from lockfile diagnostics, with no change to flag precedence or lockfile behavior. Co-authored-by: zaniebot <[email protected]>
1 parent bf041f9 commit e888329

3 files changed

Lines changed: 17 additions & 49 deletions

File tree

‎crates/uv/src/commands/project/mod.rs‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,8 @@ pub(crate) enum MissingLockfileSource {
9797
impl std::fmt::Display for MissingLockfileSource {
9898
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
9999
match self {
100-
Self::Frozen(source) => match source {
101-
FrozenSource::Cli(_) | FrozenSource::Env => write!(f, "`{source}`"),
102-
FrozenSource::Configuration => write!(f, "`frozen` (workspace configuration)"),
103-
},
104-
Self::Locked(source) => match source {
105-
LockedSource::Cli(_) | LockedSource::Env => write!(f, "`{source}`"),
106-
LockedSource::Configuration => write!(f, "`locked` (workspace configuration)"),
107-
},
100+
Self::Frozen(source) => write!(f, "`{source}`"),
101+
Self::Locked(source) => write!(f, "`{source}`"),
108102
}
109103
}
110104
}

‎crates/uv/src/commands/project/run.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ pub(crate) async fn run(
326326
Some(environment.into_interpreter())
327327
} else {
328328
// If no lockfile is found, error for `--locked` and `--frozen` when provided
329-
// via CLI. For environment variables and configuration, warn instead to avoid
329+
// via CLI. For environment variables, warn instead to avoid
330330
// breaking users who set `UV_LOCKED=1` globally.
331331
if let LockCheck::Enabled(lock_check) = lock_check {
332332
match lock_check {
@@ -336,7 +336,7 @@ pub(crate) async fn run(
336336
"uv lock --script".green(),
337337
);
338338
}
339-
LockedSource::Env | LockedSource::Configuration => {
339+
LockedSource::Env => {
340340
warn_user!(
341341
"No lockfile found for Python script (ignoring `{lock_check}`); run `{}` to generate a lockfile",
342342
"uv lock --script".green(),
@@ -352,7 +352,7 @@ pub(crate) async fn run(
352352
"uv lock --script".green(),
353353
);
354354
}
355-
FrozenSource::Env | FrozenSource::Configuration => {
355+
FrozenSource::Env => {
356356
warn_user!(
357357
"No lockfile found for Python script (ignoring `--frozen`); run `{}` to generate a lockfile",
358358
"uv lock --script".green(),

‎crates/uv/src/settings.rs‎

Lines changed: 12 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -618,16 +618,13 @@ pub(crate) enum LockedSource {
618618
Cli(LockedFlag),
619619
/// The `UV_LOCKED` environment variable was set.
620620
Env,
621-
/// The `locked` option was set via workspace configuration.
622-
Configuration,
623621
}
624622

625623
impl std::fmt::Display for LockedSource {
626624
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
627625
match self {
628626
Self::Cli(flag) => flag.fmt(f),
629627
Self::Env => write!(f, "UV_LOCKED=1"),
630-
Self::Configuration => write!(f, "locked (workspace configuration)"),
631628
}
632629
}
633630
}
@@ -649,7 +646,6 @@ impl From<LockCheck> for Flag {
649646
source: FlagSource::Env(EnvVars::UV_LOCKED),
650647
name: "locked",
651648
},
652-
LockCheck::Enabled(LockedSource::Configuration) => Self::from_config("locked"),
653649
LockCheck::Disabled => Self::disabled(),
654650
}
655651
}
@@ -684,16 +680,13 @@ pub(crate) enum FrozenSource {
684680
Cli(FrozenFlag),
685681
/// The `UV_FROZEN` environment variable was set.
686682
Env,
687-
/// The `frozen` option was set via workspace configuration.
688-
Configuration,
689683
}
690684

691685
impl std::fmt::Display for FrozenSource {
692686
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
693687
match self {
694688
Self::Cli(flag) => flag.fmt(f),
695689
Self::Env => write!(f, "UV_FROZEN=1"),
696-
Self::Configuration => write!(f, "frozen (workspace configuration)"),
697690
}
698691
}
699692
}
@@ -706,7 +699,6 @@ impl From<FrozenSource> for Flag {
706699
source: FlagSource::Env(EnvVars::UV_FROZEN),
707700
name: "frozen",
708701
},
709-
FrozenSource::Configuration => Self::from_config("frozen"),
710702
}
711703
}
712704
}
@@ -739,21 +731,12 @@ fn resolve_frozen(
739731
cli_flag: FrozenFlag,
740732
environment: EnvFlag,
741733
) -> Option<FrozenSource> {
742-
let (flag, _) = resolve_flag_pair(
743-
enabled,
744-
disabled,
745-
cli_flag.name(),
746-
"no-frozen",
747-
Some(environment),
748-
None,
749-
);
750-
match flag {
751-
Flag::Enabled { source, .. } => Some(match source {
752-
FlagSource::Cli => FrozenSource::Cli(cli_flag),
753-
FlagSource::Env(_) => FrozenSource::Env,
754-
FlagSource::Config => FrozenSource::Configuration,
755-
}),
756-
Flag::Disabled => None,
734+
if enabled {
735+
Some(FrozenSource::Cli(cli_flag))
736+
} else if !disabled && environment.value == Some(true) {
737+
Some(FrozenSource::Env)
738+
} else {
739+
None
757740
}
758741
}
759742

@@ -764,21 +747,12 @@ fn resolve_lock_check(
764747
cli_flag: LockedFlag,
765748
environment: EnvFlag,
766749
) -> LockCheck {
767-
let (flag, _) = resolve_flag_pair(
768-
enabled,
769-
disabled,
770-
cli_flag.name(),
771-
"no-locked",
772-
Some(environment),
773-
None,
774-
);
775-
match flag {
776-
Flag::Enabled { source, .. } => LockCheck::Enabled(match source {
777-
FlagSource::Cli => LockedSource::Cli(cli_flag),
778-
FlagSource::Env(_) => LockedSource::Env,
779-
FlagSource::Config => LockedSource::Configuration,
780-
}),
781-
Flag::Disabled => LockCheck::Disabled,
750+
if enabled {
751+
LockCheck::Enabled(LockedSource::Cli(cli_flag))
752+
} else if !disabled && environment.value == Some(true) {
753+
LockCheck::Enabled(LockedSource::Env)
754+
} else {
755+
LockCheck::Disabled
782756
}
783757
}
784758

0 commit comments

Comments
 (0)