Do not use the smartstring crate

.github/workflows/release.yml

@@ -1,12 +1,12 @@
-# This file was autogenerated by cargo-dist: https://opensource.axo.dev/cargo-dist/
+# This file was autogenerated by dist: https://axodotdev.github.io/cargo-dist
 #
 # Copyright 2022-2024, axodotdev
 # SPDX-License-Identifier: MIT or Apache-2.0
 #
 # CI that:
 #
 # * checks for a Git Tag that looks like a release
-# * builds artifacts with cargo-dist (archives, installers, hashes)
+# * builds artifacts with dist (archives, installers, hashes)
 # * uploads those artifacts to temporary workflow zip
 # * on success, uploads the artifacts to a GitHub Release
 #
@@ -24,10 +24,10 @@ permissions:
 # must be a Cargo-style SemVer Version (must have at least major.minor.patch).
 #
 # If PACKAGE_NAME is specified, then the announcement will be for that
-# package (erroring out if it doesn't have the given version or isn't cargo-dist-able).
+# package (erroring out if it doesn't have the given version or isn't dist-able).
 #
 # If PACKAGE_NAME isn't specified, then the announcement will be for all
-# (cargo-dist-able) packages in the workspace with that version (this mode is
+# (dist-able) packages in the workspace with that version (this mode is
 # intended for workspaces with only one dist-able package, or with all dist-able
 # packages versioned/released in lockstep).
 #
@@ -45,7 +45,7 @@ on:
       - '**[0-9]+.[0-9]+.[0-9]+*'
 
 jobs:
-  # Run 'cargo dist plan' (or host) to determine what tasks we need to do
+  # Run 'dist plan' (or host) to determine what tasks we need to do
   plan:
     runs-on: "ubuntu-22.04"
     outputs:
@@ -58,26 +58,27 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
+          persist-credentials: false
           submodules: recursive
-      - name: Install cargo-dist
+      - name: Install dist
         # we specify bash to get pipefail; it guards against the `curl` command
         # failing. otherwise `sh` won't catch that `curl` returned non-0
         shell: bash
-        run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.22.1/cargo-dist-installer.sh | sh"
-      - name: Cache cargo-dist
+        run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.29.0/cargo-dist-installer.sh | sh"
+      - name: Cache dist
         uses: actions/upload-artifact@v4
         with:
           name: cargo-dist-cache
-          path: ~/.cargo/bin/cargo-dist
+          path: ~/.cargo/bin/dist
       # sure would be cool if github gave us proper conditionals...
       # so here's a doubly-nested ternary-via-truthiness to try to provide the best possible
       # functionality based on whether this is a pull_request, and whether it's from a fork.
       # (PRs run on the *source* but secrets are usually on the *target* -- that's *good*
       # but also really annoying to build CI around when it needs secrets to work right.)
       - id: plan
         run: |
-          cargo dist ${{ (!github.event.pull_request && format('host --steps=create --tag={0}', github.ref_name)) || 'plan' }} --output-format=json > plan-dist-manifest.json
-          echo "cargo dist ran successfully"
+          dist ${{ (!github.event.pull_request && format('host --steps=create --tag={0}', github.ref_name)) || 'plan' }} --output-format=json > plan-dist-manifest.json
+          echo "dist ran successfully"
           cat plan-dist-manifest.json
           echo "manifest=$(jq -c "." plan-dist-manifest.json)" >> "$GITHUB_OUTPUT"
       - name: "Upload dist-manifest.json"
@@ -95,18 +96,19 @@ jobs:
     if: ${{ fromJson(needs.plan.outputs.val).ci.github.artifacts_matrix.include != null && (needs.plan.outputs.publishing == 'true' || fromJson(needs.plan.outputs.val).ci.github.pr_run_mode == 'upload') }}
     strategy:
       fail-fast: false
-      # Target platforms/runners are computed by cargo-dist in create-release.
+      # Target platforms/runners are computed by dist in create-release.
       # Each member of the matrix has the following arguments:
       #
       # - runner: the github runner
-      # - dist-args: cli flags to pass to cargo dist
-      # - install-dist: expression to run to install cargo-dist on the runner
+      # - dist-args: cli flags to pass to dist
+      # - install-dist: expression to run to install dist on the runner
       #
       # Typically there will be:
       # - 1 "global" task that builds universal installers
       # - N "local" tasks that build each platform's binaries and platform-specific installers
       matrix: ${{ fromJson(needs.plan.outputs.val).ci.github.artifacts_matrix }}
     runs-on: ${{ matrix.runner }}
+    container: ${{ matrix.container && matrix.container.image || null }}
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       BUILD_MANIFEST_NAME: target/distrib/${{ join(matrix.targets, '-') }}-dist-manifest.json
@@ -116,9 +118,17 @@ jobs:
           git config --global core.longpaths true
       - uses: actions/checkout@v4
         with:
+          persist-credentials: false
           submodules: recursive
-      - name: Install cargo-dist
-        run: ${{ matrix.install_dist }}
+      - name: Install Rust non-interactively if not already installed
+        if: ${{ matrix.container }}
+        run: |
+          if ! command -v cargo > /dev/null 2>&1; then
+            curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+            echo "$HOME/.cargo/bin" >> $GITHUB_PATH
+          fi
+      - name: Install dist
+        run: ${{ matrix.install_dist.run }}
       # Get the dist-manifest
       - name: Fetch local artifacts
         uses: actions/download-artifact@v4
@@ -132,8 +142,8 @@ jobs:
       - name: Build artifacts
         run: |
           # Actually do builds and make zips and whatnot
-          cargo dist build ${{ needs.plan.outputs.tag-flag }} --print=linkage --output-format=json ${{ matrix.dist_args }} > dist-manifest.json
-          echo "cargo dist ran successfully"
+          dist build ${{ needs.plan.outputs.tag-flag }} --print=linkage --output-format=json ${{ matrix.dist_args }} > dist-manifest.json
+          echo "dist ran successfully"
       - id: cargo-dist
         name: Post-build
         # We force bash here just because github makes it really hard to get values up
@@ -143,7 +153,7 @@ jobs:
         run: |
           # Parse out what we just built and upload it to scratch storage
           echo "paths<<EOF" >> "$GITHUB_OUTPUT"
-          jq --raw-output ".upload_files[]" dist-manifest.json >> "$GITHUB_OUTPUT"
+          dist print-upload-files-from-manifest --manifest dist-manifest.json >> "$GITHUB_OUTPUT"
           echo "EOF" >> "$GITHUB_OUTPUT"
 
           cp dist-manifest.json "$BUILD_MANIFEST_NAME"
@@ -167,13 +177,14 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
+          persist-credentials: false
           submodules: recursive
-      - name: Install cached cargo-dist
+      - name: Install cached dist
         uses: actions/download-artifact@v4
         with:
           name: cargo-dist-cache
           path: ~/.cargo/bin/
-      - run: chmod +x ~/.cargo/bin/cargo-dist
+      - run: chmod +x ~/.cargo/bin/dist
       # Get all the local artifacts for the global tasks to use (for e.g. checksums)
       - name: Fetch local artifacts
         uses: actions/download-artifact@v4
@@ -184,8 +195,8 @@ jobs:
       - id: cargo-dist
         shell: bash
         run: |
-          cargo dist build ${{ needs.plan.outputs.tag-flag }} --output-format=json "--artifacts=global" > dist-manifest.json
-          echo "cargo dist ran successfully"
+          dist build ${{ needs.plan.outputs.tag-flag }} --output-format=json "--artifacts=global" > dist-manifest.json
+          echo "dist ran successfully"
 
           # Parse out what we just built and upload it to scratch storage
           echo "paths<<EOF" >> "$GITHUB_OUTPUT"
@@ -216,13 +227,14 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
+          persist-credentials: false
           submodules: recursive
-      - name: Install cached cargo-dist
+      - name: Install cached dist
         uses: actions/download-artifact@v4
         with:
           name: cargo-dist-cache
           path: ~/.cargo/bin/
-      - run: chmod +x ~/.cargo/bin/cargo-dist
+      - run: chmod +x ~/.cargo/bin/dist
       # Fetch artifacts from scratch-storage
       - name: Fetch artifacts
         uses: actions/download-artifact@v4
@@ -233,7 +245,7 @@ jobs:
       - id: host
         shell: bash
         run: |
-          cargo dist host ${{ needs.plan.outputs.tag-flag }} --steps=upload --steps=release --output-format=json > dist-manifest.json
+          dist host ${{ needs.plan.outputs.tag-flag }} --steps=upload --steps=release --output-format=json > dist-manifest.json
           echo "artifacts uploaded and released successfully"
           cat dist-manifest.json
           echo "manifest=$(jq -c "." dist-manifest.json)" >> "$GITHUB_OUTPUT"
@@ -280,4 +292,5 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
+          persist-credentials: false
           submodules: recursive

CHANGELOG.md

@@ -5,6 +5,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- :boom: Removed usage of the `smartstring` crate. This changes the interface of
+  the `AnnoKey`, `Annotation`, and `Component`/`AnnotationComponent` structs and
+  is a **breaking change**, but the new interface is actually easier to call
+  because the conversion to smart strings is not necessary any longer. The
+  change also increases performance for several queries in the test set by up to
+  30%.
+
 ## [3.8.3] - 2025-08-12
 
 ### Fixed

Cargo.toml

@@ -9,27 +9,6 @@ members = [
 ]
 resolver = "3"
 
-# Config for 'cargo dist'
-[workspace.metadata.dist]
-# The preferred cargo-dist version to use in CI (Cargo.toml SemVer syntax)
-cargo-dist-version = "0.22.1"
-# CI backends to support
-ci = "github"
-# The installers to generate for each app
-installers = []
-# Which actions to run on pull requests
-pr-run-mode = "plan"
-# Target platforms to build apps for (Rust target-triple syntax)
-targets = [
-    "aarch64-apple-darwin",
-    "x86_64-apple-darwin",
-    "x86_64-unknown-linux-gnu",
-    "x86_64-pc-windows-msvc",
-]
-[workspace.metadata.dist.github-custom-runners]
-global = "ubuntu-22.04"
-x86_64-unknown-linux-gnu = "ubuntu-22.04"
-
 # Use release optimization of some of the performance sensitive crates even for debug builds.
 # This allows faster builds and debugging of our own code, while balancing performance.
 [profile.dev.package.bincode]

about.toml

@@ -1,17 +1,16 @@
 accepted = [
-  "Apache-2.0",
-  "MIT",
-  "BSD-3-Clause",
-  "BSD-2-Clause",
-  "BSL-1.0",
-  "MPL-2.0",
-  "CC0-1.0",
-  "ISC",
-  "Zlib",
-  "OpenSSL",
-  "Unicode-DFS-2016",
+    "Apache-2.0",
+    "MIT",
+    "BSD-3-Clause",
+    "BSD-2-Clause",
+    "BSL-1.0",
+    "MPL-2.0",
+    "CC0-1.0",
+    "ISC",
+    "Zlib",
+    "OpenSSL",
+    "Unicode-DFS-2016",
+    "Unicode-3.0",
 ]
 
-workarounds = [
-  "ring",
-]
+workarounds = ["ring"]

core/Cargo.toml

@@ -31,7 +31,6 @@ serde = { version = "1.0", features = ["rc"] }
 serde_bytes = "0.11"
 serde_derive = "1.0"
 smallvec = "1.6"
-smartstring = { version = "1", features = ["serde"] }
 sstable = "0.11"
 strum = "0.21"
 strum_macros = "0.21"

core/src/annostorage/inmemory.rs

@@ -9,8 +9,6 @@ use core::ops::Bound::*;
 use itertools::Itertools;
 use rand::seq::IteratorRandom;
 use rustc_hash::FxHashSet;
-use smartstring::alias::String;
-use smartstring::{LazyCompact, SmartString};
 use std::borrow::Cow;
 use std::collections::{BTreeMap, BTreeSet, HashMap};
 use std::hash::Hash;
@@ -33,10 +31,10 @@ pub struct AnnoStorageImpl<T: Ord + Hash + Default> {
     /// Maps a distinct annotation key to the number of elements having this annotation key.
     anno_key_sizes: BTreeMap<AnnoKey, usize>,
     anno_keys: SymbolTable<AnnoKey>,
-    anno_values: SymbolTable<smartstring::alias::String>,
+    anno_values: SymbolTable<String>,
 
     /// additional statistical information
-    histogram_bounds: BTreeMap<usize, Vec<smartstring::alias::String>>,
+    histogram_bounds: BTreeMap<usize, Vec<String>>,
     largest_item: Option<T>,
     total_number_of_annos: usize,
 }
@@ -299,7 +297,7 @@ where
                 result = self
                     .anno_values
                     .get_value_ref(old_value)
-                    .map(|v| Cow::Owned(v.clone().into()));
+                    .map(|v| Cow::Owned(v.clone()));
 
                 self.check_and_remove_value_symbol(old_value);
                 self.total_number_of_annos -= 1;
@@ -356,7 +354,7 @@ where
         let it = self.anno_key_sizes.range(
             AnnoKey {
                 name: name.into(),
-                ns: smartstring::alias::String::default(),
+                ns: String::default(),
             }..,
         );
         let mut result: Vec<AnnoKey> = Vec::default();
@@ -507,7 +505,7 @@ where
                     ns: String::default(),
                 }..AnnoKey {
                     name: name.into(),
-                    ns: std::char::MAX.to_string().into(),
+                    ns: std::char::MAX.to_string(),
                 },
             ),
         };
@@ -1013,8 +1011,7 @@ impl NodeAnnotationStorage for AnnoStorageImpl<NodeID> {
     fn get_node_id_from_name(&self, node_name: &str) -> Result<Option<NodeID>> {
         if let (Some(anno_name_symbol), Some(value_symbol)) = (
             self.anno_keys.get_symbol(&NODE_NAME_KEY),
-            self.anno_values
-                .get_symbol(&SmartString::<LazyCompact>::from(node_name)),
+            self.anno_values.get_symbol(&String::from(node_name)),
         ) && let Some(items_with_anno) = self.by_anno.get(&anno_name_symbol)
             && let Some(items) = items_with_anno.get(&value_symbol)
         {
@@ -1027,8 +1024,7 @@ impl NodeAnnotationStorage for AnnoStorageImpl<NodeID> {
     fn has_node_name(&self, node_name: &str) -> Result<bool> {
         if let (Some(anno_name_symbol), Some(value_symbol)) = (
             self.anno_keys.get_symbol(&NODE_NAME_KEY),
-            self.anno_values
-                .get_symbol(&SmartString::<LazyCompact>::from(node_name)),
+            self.anno_values.get_symbol(&String::from(node_name)),
         ) && let Some(items_with_anno) = self.by_anno.get(&anno_name_symbol)
             && let Some(items) = items_with_anno.get(&value_symbol)
         {