Merge pull request #20988 from Veykril/push-rutmxykksupu

Merge `smol_str` into rust-analyzer

Author: Veykril

Cargo.lock

@@ -0,0 +1,127 @@
+use std::{
+    env, fs,
+    process::{self, Command, ExitStatus, Stdio},
+    time::Instant,
+};
+
+type Error = Box<dyn std::error::Error>;
+type Result<T> = std::result::Result<T, Error>;
+
+fn main() {
+    if let Err(err) = try_main() {
+        eprintln!("{}", err);
+        process::exit(1);
+    }
+}
+
+fn try_main() -> Result<()> {
+    let cwd = env::current_dir()?;
+    let cargo_toml = cwd.join("Cargo.toml");
+    assert!(
+        cargo_toml.exists(),
+        "Cargo.toml not found, cwd: {}",
+        cwd.display()
+    );
+
+    {
+        let _s = Section::new("BUILD_NO_DEFAULT_FEATURES");
+        shell("cargo test --all-features --workspace --no-run --no-default-features")?;
+    }
+
+    {
+        let _s = Section::new("BUILD");
+        shell("cargo test --all-features --workspace --no-run")?;
+    }
+
+    {
+        let _s = Section::new("TEST");
+        shell("cargo test --all-features --workspace")?;
+        shell("cargo test --no-default-features --workspace")?;
+    }
+
+    {
+        let _s = Section::new("TEST_BENCHES");
+        shell("cargo test --benches --all-features")?;
+    }
+
+    let current_branch = shell_output("git branch --show-current")?;
+    if &current_branch == "master" {
+        let _s = Section::new("PUBLISH");
+        let manifest = fs::read_to_string(&cargo_toml)?;
+        let version = get_field(&manifest, "version")?;
+        let tag = format!("v{}", version);
+        let tags = shell_output("git tag --list")?;
+
+        if !tags.contains(&tag) {
+            let token = env::var("CRATES_IO_TOKEN").unwrap();
+            shell(&format!("git tag v{}", version))?;
+            shell(&format!("cargo publish --token {}", token))?;
+            shell("git push --tags")?;
+        }
+    }
+    Ok(())
+}
+
+fn get_field<'a>(text: &'a str, name: &str) -> Result<&'a str> {
+    for line in text.lines() {
+        let words = line.split_ascii_whitespace().collect::<Vec<_>>();
+        match words.as_slice() {
+            [n, "=", v, ..] if n.trim() == name => {
+                assert!(v.starts_with('"') && v.ends_with('"'));
+                return Ok(&v[1..v.len() - 1]);
+            }
+            _ => (),
+        }
+    }
+    Err(format!("can't find `{}` in\n----\n{}\n----\n", name, text))?
+}
+
+fn shell(cmd: &str) -> Result<()> {
+    let status = command(cmd).status()?;
+    check_status(status)
+}
+
+fn shell_output(cmd: &str) -> Result<String> {
+    let output = command(cmd).stderr(Stdio::inherit()).output()?;
+    check_status(output.status)?;
+    let res = String::from_utf8(output.stdout)?;
+    let res = res.trim().to_string();
+    println!("{}", res);
+    Ok(res)
+}
+
+fn command(cmd: &str) -> Command {
+    eprintln!("> {}", cmd);
+    let words = cmd.split_ascii_whitespace().collect::<Vec<_>>();
+    let (cmd, args) = words.split_first().unwrap();
+    let mut res = Command::new(cmd);
+    res.args(args);
+    res
+}
+
+fn check_status(status: ExitStatus) -> Result<()> {
+    if !status.success() {
+        Err(format!("$status: {}", status))?;
+    }
+    Ok(())
+}
+
+struct Section {
+    name: &'static str,
+    start: Instant,
+}
+
+impl Section {
+    fn new(name: &'static str) -> Section {
+        println!("::group::{}", name);
+        let start = Instant::now();
+        Section { name, start }
+    }
+}
+
+impl Drop for Section {
+    fn drop(&mut self) {
+        eprintln!("{}: {:.2?}", self.name, self.start.elapsed());
+        println!("::endgroup::");
+    }
+}

lib/smol_str/.github/ci.rs

@@ -0,0 +1,36 @@
+name: CI
+on:
+  pull_request:
+  push:
+    branches:
+    - master
+    - staging
+    - trying
+
+env:
+  CARGO_INCREMENTAL: 0
+  CARGO_NET_RETRY: 10
+  CI: 1
+  RUST_BACKTRACE: short
+  RUSTFLAGS: -D warnings
+  RUSTUP_MAX_RETRIES: 10
+
+jobs:
+  rust:
+    name: Rust
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+
+    - name: Install Rust toolchain
+      uses: actions-rust-lang/setup-rust-toolchain@v1
+      with:
+        cache: false
+
+    - run: rustc ./.github/ci.rs && ./ci
+      env:
+        CRATES_IO_TOKEN: ${{ secrets.CRATES_IO_TOKEN }}

lib/smol_str/.github/workflows/ci.yaml

@@ -0,0 +1,4 @@
+/target
+/ci
+/.vscode
+Cargo.lock

lib/smol_str/.gitignore

@@ -0,0 +1,38 @@
+# Changelog
+
+## Unreleased
+
+## 0.3.4 - 2025-10-23
+
+- Added `rust-version` field to `Cargo.toml`
+
+## 0.3.3 - 2025-10-23
+
+- Optimise `StrExt::to_ascii_lowercase_smolstr`, `StrExt::to_ascii_uppercase_smolstr`
+  ~2x speedup inline, ~4-22x for heap.
+- Optimise `StrExt::to_lowercase_smolstr`, `StrExt::to_uppercase_smolstr` ~2x speedup inline, ~5-50x for heap.
+- Optimise `StrExt::replace_smolstr`, `StrExt::replacen_smolstr` for single ascii replace,
+  ~3x speedup inline & heap.
+
+## 0.3.2 - 2024-10-23
+
+- Fix `SmolStrBuilder::push` incorrectly padding null bytes when spilling onto the heap on a
+  multibyte character push
+
+## 0.3.1 - 2024-09-04
+
+- Fix `SmolStrBuilder` leaking implementation details
+
+## 0.3.0 - 2024-09-04
+
+- Remove deprecated `SmolStr::new_inline_from_ascii` function
+- Remove `SmolStr::to_string` in favor of `ToString::to_string`
+- Add `impl AsRef<[u8]> for SmolStr` impl
+- Add `impl AsRef<OsStr> for SmolStr` impl
+- Add `impl AsRef<Path> for SmolStr` impl
+- Add `SmolStrBuilder`
+
+## 0.2.2 - 2024-05-14
+
+- Add `StrExt` trait providing `to_lowercase_smolstr`, `replace_smolstr` and similar
+- Add `PartialEq` optimization for `ptr_eq`-able representations

lib/smol_str/CHANGELOG.md

@@ -0,0 +1,37 @@
+[package]
+name = "smol_str"
+version = "0.3.4"
+description = "small-string optimized string type with O(1) clone"
+license = "MIT OR Apache-2.0"
+repository = "https://github.com/rust-lang/rust-analyzer/tree/master/lib/smol_str"
+authors = ["Aleksey Kladov <aleksey.kladov@gmail.com>", "Lukas Wirth <lukastw97@gmail.com>"]
+edition = "2021"
+rust-version = "1.89"
+
+[package.metadata.docs.rs]
+rustdoc-args = ["--cfg", "docsrs"]
+all-features = true
+
+[dependencies]
+serde_core = { version = "1.0.220", optional = true, default-features = false }
+borsh = { version = "1.4.0", optional = true, default-features = false }
+arbitrary = { version = "1.3", optional = true }
+
+[dev-dependencies]
+proptest = "1.5"
+serde_json = "1.0"
+serde = { version = "1.0", features = ["derive"] }
+criterion = "0.7"
+rand = "0.9.2"
+
+[features]
+default = ["std"]
+std = ["serde_core?/std", "borsh?/std"]
+serde = ["dep:serde_core"]
+
+[[bench]]
+name = "bench"
+harness = false
+
+[lints]
+workspace = true