Andrew Gallant
1379b530f6
Recently, rkyv 0.8 was released. Its API is a fair bit simpler now for
higher level uses (like for us in `uv`) and results in us being able to
delete a fair bit of code. This also removes our last dependency on `syn
1.0`, and thus drops that dependency.
Performance (via testing on the `transformers` example) seems to remain
about the same, which is what was expected:
```
$ hyperfine -w5 -r100 'uv lock' 'uv-ag-rkyv-update lock'
Benchmark 1: uv lock
Time (mean ± σ): 55.6 ms ± 6.4 ms [User: 30.4 ms, System: 35.1 ms]
Range (min … max): 43.0 ms … 73.1 ms 100 runs
Benchmark 2: uv-ag-rkyv-update lock
Time (mean ± σ): 56.5 ms ± 7.2 ms [User: 30.5 ms, System: 36.3 ms]
Range (min … max): 39.1 ms … 71.5 ms 100 runs
Summary
uv lock ran
1.02 ± 0.18 times faster than uv-ag-rkyv-update lock
```
Closes #7415
105 lines
2.9 KiB
Rust
105 lines
2.9 KiB
Rust
use std::borrow::Cow;
|
|
use std::str::FromStr;
|
|
|
|
use serde::{Deserialize, Deserializer, Serialize};
|
|
|
|
use crate::{validate_and_normalize_owned, validate_and_normalize_ref, InvalidNameError};
|
|
|
|
/// The normalized name of a package.
|
|
///
|
|
/// Converts the name to lowercase and collapses runs of `-`, `_`, and `.` down to a single `-`.
|
|
/// For example, `---`, `.`, and `__` are all converted to a single `-`.
|
|
///
|
|
/// See: <https://packaging.python.org/en/latest/specifications/name-normalization/>
|
|
#[derive(
|
|
Debug,
|
|
Default,
|
|
Clone,
|
|
PartialEq,
|
|
Eq,
|
|
PartialOrd,
|
|
Ord,
|
|
Hash,
|
|
Serialize,
|
|
rkyv::Archive,
|
|
rkyv::Deserialize,
|
|
rkyv::Serialize,
|
|
)]
|
|
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
|
|
#[rkyv(derive(Debug))]
|
|
pub struct PackageName(String);
|
|
|
|
impl PackageName {
|
|
/// Create a validated, normalized package name.
|
|
pub fn new(name: String) -> Result<Self, InvalidNameError> {
|
|
validate_and_normalize_owned(name).map(Self)
|
|
}
|
|
|
|
/// Escape this name with underscores (`_`) instead of dashes (`-`)
|
|
///
|
|
/// See: <https://packaging.python.org/en/latest/specifications/recording-installed-packages/#recording-installed-packages>
|
|
pub fn as_dist_info_name(&self) -> Cow<'_, str> {
|
|
if let Some(dash_position) = self.0.find('-') {
|
|
// Initialize `replaced` with the start of the string up to the current character.
|
|
let mut owned_string = String::with_capacity(self.0.len());
|
|
owned_string.push_str(&self.0[..dash_position]);
|
|
owned_string.push('_');
|
|
|
|
// Iterate over the rest of the string.
|
|
owned_string.extend(self.0[dash_position + 1..].chars().map(|character| {
|
|
if character == '-' {
|
|
'_'
|
|
} else {
|
|
character
|
|
}
|
|
}));
|
|
|
|
Cow::Owned(owned_string)
|
|
} else {
|
|
Cow::Borrowed(self.0.as_str())
|
|
}
|
|
}
|
|
|
|
/// Returns the underlying package name.
|
|
pub fn as_str(&self) -> &str {
|
|
&self.0
|
|
}
|
|
}
|
|
|
|
impl From<&Self> for PackageName {
|
|
/// Required for `WaitMap::wait`.
|
|
fn from(package_name: &Self) -> Self {
|
|
package_name.clone()
|
|
}
|
|
}
|
|
|
|
impl FromStr for PackageName {
|
|
type Err = InvalidNameError;
|
|
|
|
fn from_str(name: &str) -> Result<Self, Self::Err> {
|
|
validate_and_normalize_ref(name).map(Self)
|
|
}
|
|
}
|
|
|
|
impl<'de> Deserialize<'de> for PackageName {
|
|
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
|
|
where
|
|
D: Deserializer<'de>,
|
|
{
|
|
let s = String::deserialize(deserializer)?;
|
|
Self::from_str(&s).map_err(serde::de::Error::custom)
|
|
}
|
|
}
|
|
|
|
impl std::fmt::Display for PackageName {
|
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
self.0.fmt(f)
|
|
}
|
|
}
|
|
|
|
impl AsRef<str> for PackageName {
|
|
fn as_ref(&self) -> &str {
|
|
&self.0
|
|
}
|
|
}
|