Merge pull request #21002 from Veykril/veykril/push-nztxvpnntmrx

lib: Bump editions to 2024 and remove legacy files

Author: Veykril

lib/smol_str/.github/ci.rs

@@ -5,7 +5,7 @@ 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"
+edition = "2024"
 rust-version = "1.89"
 
 [package.metadata.docs.rs]

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

@@ -1,6 +1,6 @@
-use criterion::{criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, criterion_group, criterion_main};
 use rand::distr::{Alphanumeric, SampleString};
-use smol_str::{format_smolstr, SmolStr, StrExt, ToSmolStr};
+use smol_str::{SmolStr, StrExt, ToSmolStr, format_smolstr};
 use std::hint::black_box;
 
 /// 12: small (inline)

lib/smol_str/.gitignore

@@ -1,8 +1,8 @@
-use crate::{Repr, SmolStr, INLINE_CAP};
+use crate::{INLINE_CAP, Repr, SmolStr};
 use alloc::string::{String, ToString};
 use borsh::{
-    io::{Error, ErrorKind, Read, Write},
     BorshDeserialize, BorshSerialize,
+    io::{Error, ErrorKind, Read, Write},
 };
 use core::mem::transmute;
 

lib/smol_str/Cargo.toml

@@ -434,8 +434,7 @@ impl FromStr for SmolStr {
 const INLINE_CAP: usize = InlineSize::_V23 as usize;
 const N_NEWLINES: usize = 32;
 const N_SPACES: usize = 128;
-const WS: &str =
-    "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n                                                                                                                                ";
+const WS: &str = "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n                                                                                                                                ";
 const _: () = {
     assert!(WS.len() == N_NEWLINES + N_SPACES);
     assert!(WS.as_bytes()[N_NEWLINES - 1] == b'\n');
@@ -690,24 +689,24 @@ impl StrExt for str {
     #[inline]
     fn replacen_smolstr(&self, from: &str, to: &str, mut count: usize) -> SmolStr {
         // Fast path for replacing a single ASCII character with another inline.
-        if let [from_u8] = from.as_bytes() {
-            if let [to_u8] = to.as_bytes() {
-                return if self.len() <= count {
-                    // SAFETY: `from_u8` & `to_u8` are ascii
-                    unsafe { replacen_1_ascii(self, |b| if b == from_u8 { *to_u8 } else { *b }) }
-                } else {
-                    unsafe {
-                        replacen_1_ascii(self, |b| {
-                            if b == from_u8 && count != 0 {
-                                count -= 1;
-                                *to_u8
-                            } else {
-                                *b
-                            }
-                        })
-                    }
-                };
-            }
+        if let [from_u8] = from.as_bytes()
+            && let [to_u8] = to.as_bytes()
+        {
+            return if self.len() <= count {
+                // SAFETY: `from_u8` & `to_u8` are ascii
+                unsafe { replacen_1_ascii(self, |b| if b == from_u8 { *to_u8 } else { *b }) }
+            } else {
+                unsafe {
+                    replacen_1_ascii(self, |b| {
+                        if b == from_u8 && count != 0 {
+                            count -= 1;
+                            *to_u8
+                        } else {
+                            *b
+                        }
+                    })
+                }
+            };
         }
 
         let mut result = SmolStrBuilder::new();