mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-07-07 21:35:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Remove Option<bool> for --no-cache (#3129)

Browse source 
## Summary

This was unintended. We ended up reverting `Option<bool>` everywhere,
but I missed this once since it's in a separate file.

(If you use `Option<bool>`, Clap requires a value, like `--no-cache
true`.)

## Test Plan

`cargo run pip install flask --no-cache`
This commit is contained in:
Charlie Marsh 2024-04-18 18:56:46 -04:00 • committed by GitHub
parent 25deddd3bf
commit 0ce039d1f9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/uv-cache/src/cli.rs
View file

@ -14,9 +14,10 @@ pub struct CacheArgs {
long,
short,
alias = "no-cache-dir",
env = "UV_NO_CACHE"
env = "UV_NO_CACHE",
value_parser = clap::builder::BoolishValueParser::new(),
)]
pub no_cache: Option<bool>,
pub no_cache: bool,
/// Path to the cache directory.
///
@ -35,11 +36,8 @@ impl Cache {
/// 4. A `.uv_cache` directory in the current working directory.
///
/// Returns an absolute cache dir.
pub fn from_settings(
no_cache: Option<bool>,
cache_dir: Option<PathBuf>,
) -> Result<Self, io::Error> {
if no_cache.unwrap_or(false) {
pub fn from_settings(no_cache: bool, cache_dir: Option<PathBuf>) -> Result<Self, io::Error> {
if no_cache {
Cache::temp()
} else if let Some(cache_dir) = cache_dir {
Cache::from_path(cache_dir)

9
crates/uv/src/settings.rs
View file

@ -47,7 +47,7 @@ impl GlobalSettings {
#[allow(clippy::struct_excessive_bools)]
#[derive(Debug, Clone)]
pub(crate) struct CacheSettings {
pub(crate) no_cache: Option<bool>,
pub(crate) no_cache: bool,
pub(crate) cache_dir: Option<PathBuf>,
}
@ -55,9 +55,10 @@ impl CacheSettings {
/// Resolve the [`CacheSettings`] from the CLI and workspace configuration.
pub(crate) fn resolve(args: CacheArgs, workspace: Option<&Workspace>) -> Self {
Self {
no_cache: args
.no_cache
.or(workspace.and_then(|workspace| workspace.options.no_cache)),
no_cache: args.no_cache
|| workspace
.and_then(|workspace| workspace.options.no_cache)
.unwrap_or(false),
cache_dir: args
.cache_dir
.or_else(|| workspace.and_then(|workspace| workspace.options.cache_dir.clone())),