mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-10-30 11:37:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Force a niche into VersionSmall (#10385)

Browse source
This commit is contained in:
konsti 2025-01-08 14:33:39 +01:00 • committed by GitHub
parent 68adadf806
commit 15c81e9a02
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
crates/uv-pep440/src/version.rs
View file

@ -1,4 +1,5 @@
use serde::{de, Deserialize, Deserializer, Serialize, Serializer}; use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
use std::num::NonZero;
use std::ops::Deref; use std::ops::Deref;
use std::sync::LazyLock; use std::sync::LazyLock;
use std::{ use std::{
@ -933,14 +934,13 @@ impl FromStr for Version {
struct VersionSmall { struct VersionSmall {
/// The number of segments in the release component. /// The number of segments in the release component.
/// ///
/// Strictly speaking, this isn't necessary since `1.2` is considered /// PEP 440 considers `1.2` equivalent to `1.2.0.0`, but we want to preserve trailing zeroes
/// equivalent to `1.2.0.0`. But in practice it's nice to be able /// in roundtrips, as the "full" version representation also does.
/// to truncate the zero components. And always filling out to 4
/// places somewhat exposes internal details, since the "full" version
/// representation would not do that.
len: u8, len: u8,
/// The representation discussed above. /// The representation discussed above.
repr: u64, repr: u64,
/// Force a niche into the aligned type so the [`Version`] enum is two words instead of three.
_force_niche: NonZero<u8>,
} }
impl VersionSmall { impl VersionSmall {
@ -989,6 +989,7 @@ impl VersionSmall {
#[inline] #[inline]
fn new() -> Self { fn new() -> Self {
Self { Self {
_force_niche: NonZero::<u8>::MIN,
repr: Self::SUFFIX_NONE << Self::SUFFIX_VERSION_BIT_LEN, repr: Self::SUFFIX_NONE << Self::SUFFIX_VERSION_BIT_LEN,
len: 0, len: 0,
} }
@ -1800,6 +1801,7 @@ impl<'a> Parser<'a> {
*release.get_mut(usize::from(len))? = cur; *release.get_mut(usize::from(len))? = cur;
len += 1; len += 1;
let small = VersionSmall { let small = VersionSmall {
_force_niche: NonZero::<u8>::MIN,
repr: (u64::from(release[0]) << 48) repr: (u64::from(release[0]) << 48)
| (u64::from(release[1]) << 40) | (u64::from(release[1]) << 40)
| (u64::from(release[2]) << 32) | (u64::from(release[2]) << 32)
@ -4007,4 +4009,10 @@ mod tests {
assert_eq!(&*v2.release(), &[1, 2]); assert_eq!(&*v2.release(), &[1, 2]);
assert_eq!(v2.to_string(), "1.2"); assert_eq!(v2.to_string(), "1.2");
} }
#[test]
fn type_size() {
assert_eq!(size_of::<VersionSmall>(), size_of::<usize>() * 2);
assert_eq!(size_of::<Version>(), size_of::<usize>() * 2);
}
} }