mirror of https://github.com/astral-sh/uv
Avoid allocations for default cache keys (#12063)
This commit is contained in:
parent
029b9e1fcd
commit
e0f81f0d4a
|
|
@ -1,3 +1,4 @@
|
|||
use std::borrow::Cow;
|
||||
use std::cmp::max;
|
||||
use std::collections::BTreeMap;
|
||||
use std::path::{Path, PathBuf};
|
||||
|
|
@ -35,7 +36,7 @@ pub struct CacheInfo {
|
|||
env: BTreeMap<String, Option<String>>,
|
||||
/// The timestamp or inode of any directories that should be considered in the cache key.
|
||||
#[serde(default)]
|
||||
directories: BTreeMap<String, Option<DirectoryTimestamp>>,
|
||||
directories: BTreeMap<Cow<'static, str>, Option<DirectoryTimestamp>>,
|
||||
}
|
||||
|
||||
impl CacheInfo {
|
||||
|
|
@ -83,11 +84,11 @@ impl CacheInfo {
|
|||
// If no cache keys were defined, use the defaults.
|
||||
let cache_keys = cache_keys.unwrap_or_else(|| {
|
||||
vec![
|
||||
CacheKey::Path("pyproject.toml".to_string()),
|
||||
CacheKey::Path("setup.py".to_string()),
|
||||
CacheKey::Path("setup.cfg".to_string()),
|
||||
CacheKey::Path(Cow::Borrowed("pyproject.toml")),
|
||||
CacheKey::Path(Cow::Borrowed("setup.py")),
|
||||
CacheKey::Path(Cow::Borrowed("setup.cfg")),
|
||||
CacheKey::Directory {
|
||||
dir: "src".to_string(),
|
||||
dir: Cow::Borrowed("src"),
|
||||
},
|
||||
]
|
||||
});
|
||||
|
|
@ -97,14 +98,18 @@ impl CacheInfo {
|
|||
for cache_key in cache_keys {
|
||||
match cache_key {
|
||||
CacheKey::Path(file) | CacheKey::File { file } => {
|
||||
if file.chars().any(|c| matches!(c, '*' | '?' | '[' | '{')) {
|
||||
if file
|
||||
.as_ref()
|
||||
.chars()
|
||||
.any(|c| matches!(c, '*' | '?' | '[' | '{'))
|
||||
{
|
||||
// Defer globs to a separate pass.
|
||||
globs.push(file);
|
||||
continue;
|
||||
}
|
||||
|
||||
// Treat the path as a file.
|
||||
let path = directory.join(&file);
|
||||
let path = directory.join(file.as_ref());
|
||||
let metadata = match path.metadata() {
|
||||
Ok(metadata) => metadata,
|
||||
Err(err) if err.kind() == std::io::ErrorKind::NotFound => {
|
||||
|
|
@ -126,7 +131,7 @@ impl CacheInfo {
|
|||
}
|
||||
CacheKey::Directory { dir } => {
|
||||
// Treat the path as a directory.
|
||||
let path = directory.join(&dir);
|
||||
let path = directory.join(dir.as_ref());
|
||||
let metadata = match path.metadata() {
|
||||
Ok(metadata) => metadata,
|
||||
Err(err) if err.kind() == std::io::ErrorKind::NotFound => {
|
||||
|
|
@ -296,11 +301,11 @@ struct ToolUv {
|
|||
#[serde(untagged, rename_all = "kebab-case", deny_unknown_fields)]
|
||||
pub enum CacheKey {
|
||||
/// Ex) `"Cargo.lock"` or `"**/*.toml"`
|
||||
Path(String),
|
||||
Path(Cow<'static, str>),
|
||||
/// Ex) `{ file = "Cargo.lock" }` or `{ file = "**/*.toml" }`
|
||||
File { file: String },
|
||||
File { file: Cow<'static, str> },
|
||||
/// Ex) `{ dir = "src" }`
|
||||
Directory { dir: String },
|
||||
Directory { dir: Cow<'static, str> },
|
||||
/// Ex) `{ git = true }` or `{ git = { commit = true, tags = false } }`
|
||||
Git { git: GitPattern },
|
||||
/// Ex) `{ env = "UV_CACHE_INFO" }`
|
||||
|
|
|
|||
Loading…
Reference in New Issue