Use a `SmallString` for the Yanked enum by charliermarsh · Pull Request #11715 · astral-sh/uv

charliermarsh · 2025-02-22T22:14:19Z

Summary

This is stored on File, which we create extensively. Easy way to reduce size.

konstin

Should we use a Option<Box<Yanked>> on File? This should be even smaller (usize) and yanked versions are rare.

charliermarsh · 2025-02-24T18:45:23Z

We should validate that that’s smaller, since SmallString is also a single word (but Yanked might be two now with discriminant).

charliermarsh · 2025-02-24T18:59:21Z

I can check and change if necessary before merging; no need for you to spend more time on it.

konstin · 2025-02-24T19:00:25Z

I've confirmed that that's the case on x86_64 with a test (below). The background is that even though Arc (and its variant such as ArcStr) are a pointer, and an x86_64 pointer only uses 48 bits of its 64 bits (leaving us 16 bit), rustc only sees a NonNull with a single niche (Null). Yanked needs at least two niches to represent Yanked::Bool, so it doesn't fit and we get padded to two words. In the experiments I made, all instances of enums where one variant contained a pointer and there was more than a single other variant without (like Option<T>), the enum would get padded to two words.

I don't feel strongly about what we do with File here, its 432 vs 424 bytes, this is for context.

    #[test]
    fn yanked_size() {
        assert_eq!(size_of::<Option<Yanked>>(), size_of::<usize>() * 2);
        assert_eq!(size_of::<Option<Box<Yanked>>>(), size_of::<usize>());
    }

    #[test]
    #[cfg(target_pointer_width = "64")]
    fn file_size() {
        assert_eq!(size_of::<Option<crate::File>>(), 432);
        #[derive(Debug, Clone, Deserialize)]
        #[serde(rename_all = "kebab-case")]
        pub struct File2 {
            // PEP 714-renamed field, followed by PEP 691-compliant field, followed by non-PEP 691-compliant
            // alias used by PyPI.
            pub core_metadata: Option<CoreMetadata>,
            pub dist_info_metadata: Option<CoreMetadata>,
            pub data_dist_info_metadata: Option<CoreMetadata>,
            pub filename: String,
            pub hashes: Hashes,
            /// There are a number of invalid specifiers on PyPI, so we first try to parse it into a
            /// [`VersionSpecifiers`] according to spec (PEP 440), then a [`LenientVersionSpecifiers`] with
            /// fixup for some common problems and if this still fails, we skip the file when creating a
            /// version map.
            #[serde(
                default,
                deserialize_with = "crate::simple_json::deserialize_version_specifiers_lenient"
            )]
            pub requires_python: Option<Result<VersionSpecifiers, VersionSpecifiersParseError>>,
            pub size: Option<u64>,
            pub upload_time: Option<Timestamp>,
            pub url: String,
            pub yanked: Option<Box<Yanked>>,
        }
        assert_eq!(size_of::<File2>(), 424);
    }

charliermarsh · 2025-02-24T19:03:52Z

I'll change separately.

## Summary See: #11715.

This MR contains the following updates: | Package | Update | Change | |---|---|---| | [astral-sh/uv](https://github.com/astral-sh/uv) | patch | `0.6.0` -> `0.6.3` | MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot). **Proposed changes to behavior should be submitted there as MRs.** --- ### Release Notes <details> <summary>astral-sh/uv (astral-sh/uv)</summary> ### [`v0.6.3`](https://github.com/astral-sh/uv/blob/HEAD/CHANGELOG.md#063) [Compare Source](astral-sh/uv@0.6.2...0.6.3) ##### Enhancements - Allow quotes around command-line options in `requirement.txt files` ([#11644](astral-sh/uv#11644)) - Initialize PEP 723 script in `uv lock --script` ([#11717](astral-sh/uv#11717)) ##### Configuration - Accept multiple `.env` files in `UV_ENV_FILE` ([#11665](astral-sh/uv#11665)) ##### Performance - Reduce overhead in converting resolutions ([#11660](astral-sh/uv#11660)) - Use `SmallString` on `Hashes` ([#11756](astral-sh/uv#11756)) - Use a `Box` for `Yanked` on `File` ([#11755](astral-sh/uv#11755)) - Use a `SmallString` for the `Yanked` enum ([#11715](astral-sh/uv#11715)) - Use boxed slices for hash vector ([#11714](astral-sh/uv#11714)) - Use install concurrency for bytecode compilation too ([#11615](astral-sh/uv#11615)) ##### Bug fixes - Avoid installing duplicate dependencies across conflicting groups ([#11653](astral-sh/uv#11653)) - Check subdirectory existence after cache heal ([#11719](astral-sh/uv#11719)) - Include uppercase platforms for Windows wheels ([#11681](astral-sh/uv#11681)) - Respect existing PEP 723 script settings in `uv add` ([#11716](astral-sh/uv#11716)) - Reuse refined interpreter to create tool environment ([#11680](astral-sh/uv#11680)) - Skip removed directories during bytecode compilation ([#11633](astral-sh/uv#11633)) - Support conflict markers in `uv export` ([#11643](astral-sh/uv#11643)) - Treat lockfile as outdated if (empty) extras are added ([#11702](astral-sh/uv#11702)) - Display path separators as backslashes on Windows ([#11667](astral-sh/uv#11667)) - Display the built file name instead of the canonicalized name in `uv build` ([#11593](astral-sh/uv#11593)) - Fix message when there are no buildable packages ([#11722](astral-sh/uv#11722)) - Re-allow HTTP schemes for Git dependencies ([#11687](astral-sh/uv#11687)) ##### Documentation - Add anchor links to arguments and options in the CLI reference ([#11754](astral-sh/uv#11754)) - Add link to environment marker specification ([#11748](astral-sh/uv#11748)) - Fix missing a closing bracket in the `cache-keys` setting ([#11669](astral-sh/uv#11669)) - Remove the last edited date from documentation pages ([#11753](astral-sh/uv#11753)) - Fix readme typo ([#11742](astral-sh/uv#11742)) ### [`v0.6.2`](https://github.com/astral-sh/uv/blob/HEAD/CHANGELOG.md#062) [Compare Source](astral-sh/uv@0.6.1...0.6.2) ##### Enhancements - Add support for constraining build dependencies with `tool.uv.build-constraint-dependencies` ([#11585](astral-sh/uv#11585)) - Sort dependency group keys when adding new group ([#11591](astral-sh/uv#11591)) ##### Performance - Use an `Arc` for index URLs ([#11586](astral-sh/uv#11586)) ##### Bug fixes - Allow use of x86-64 Python on ARM Windows ([#11625](astral-sh/uv#11625)) - Fix an issue where conflict markers could instigate a very large lock file ([#11293](astral-sh/uv#11293)) - Fix duplicate packages with multiple conflicting extras declared ([#11513](astral-sh/uv#11513)) - Respect color settings for log messages ([#11604](astral-sh/uv#11604)) - Eagerly reject unsupported Git schemes ([#11514](astral-sh/uv#11514)) ##### Documentation - Add documentation for specifying Python versions in tool commands ([#11598](astral-sh/uv#11598)) ### [`v0.6.1`](https://github.com/astral-sh/uv/blob/HEAD/CHANGELOG.md#061) [Compare Source](astral-sh/uv@0.6.0...0.6.1) ##### Enhancements - Allow users to mark platforms as "required" for wheel coverage ([#10067](astral-sh/uv#10067)) - Warn for builds in non-build and workspace root pyproject.toml ([#11394](astral-sh/uv#11394)) ##### Bug fixes - Add `--all` to `uvx --reinstall` message ([#11535](astral-sh/uv#11535)) - Fallback to `GET` on HTTP 400 when attempting to use range requests for wheel download ([#11539](astral-sh/uv#11539)) - Prefer local variants in preference selection ([#11546](astral-sh/uv#11546)) - Respect verbatim executable name in `uvx` ([#11524](astral-sh/uv#11524)) ##### Documentation - Add documentation for required environments ([#11542](astral-sh/uv#11542)) - Note that `main.py` used to be `hello.py` ([#11519](astral-sh/uv#11519)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).

## Summary This is stored on `File`, which we create extensively. Easy way to reduce size.

## Summary See: astral-sh#11715.

Use a SmallString for the Yanked enum

b4a1945

charliermarsh added the performance Potential performance improvement label Feb 22, 2025

konstin approved these changes Feb 24, 2025

View reviewed changes

charliermarsh merged commit 4fc181d into main Feb 24, 2025
92 checks passed

charliermarsh deleted the charlie/p-6 branch February 24, 2025 19:04

charliermarsh mentioned this pull request Feb 24, 2025

Use a Box for Yanked on File #11755

Merged

charliermarsh added a commit that referenced this pull request Feb 24, 2025

Use a Box for Yanked on File (#11755)

d9adba1

## Summary See: #11715.

BrewTestBot mentioned this pull request Feb 24, 2025

uv 0.6.3 Homebrew/homebrew-core#208817

Merged

loic-lescoat pushed a commit to loic-lescoat/uv that referenced this pull request Mar 2, 2025

Use a SmallString for the Yanked enum (astral-sh#11715)

e397f97

## Summary This is stored on `File`, which we create extensively. Easy way to reduce size.

loic-lescoat pushed a commit to loic-lescoat/uv that referenced this pull request Mar 2, 2025

Use a Box for Yanked on File (astral-sh#11755)

dff31e9

## Summary See: astral-sh#11715.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Comments

Use a `SmallString` for the Yanked enum#11715

Use a `SmallString` for the Yanked enum#11715
charliermarsh merged 1 commit intomainfrom
charlie/p-6

charliermarsh commented Feb 22, 2025

Uh oh!

konstin left a comment

Uh oh!

charliermarsh commented Feb 24, 2025

Uh oh!

charliermarsh commented Feb 24, 2025

Uh oh!

konstin commented Feb 24, 2025

Uh oh!

charliermarsh commented Feb 24, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Comments

Conversation

charliermarsh commented Feb 22, 2025

Summary

Uh oh!

konstin left a comment

Choose a reason for hiding this comment

Uh oh!

charliermarsh commented Feb 24, 2025

Uh oh!

charliermarsh commented Feb 24, 2025

Uh oh!

konstin commented Feb 24, 2025

Uh oh!

charliermarsh commented Feb 24, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants