itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-09-28 11:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: clone-on-write when needed for InternedString (#14808)

Browse Source 
### What does this PR try to resolve?

Use `Cow` instead of duplicating the interning logic.

Closes #14674

### How should we test and review this PR?

### Additional information
This commit is contained in:
Ed Page 2024-11-11 19:20:19 +00:00 committed by GitHub
commit 2bdeb60539
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/cargo/util/interning.rs
View File

@ -1,6 +1,7 @@
use serde::{Serialize, Serializer};
use serde_untagged::UntaggedEnumVisitor;
use std::borrow::Borrow;
use std::borrow::Cow;
use std::cmp::Ordering;
use std::collections::HashSet;
use std::ffi::OsStr;
@ -46,7 +47,7 @@ impl<'a> From<&'a String> for InternedString {
impl From<String> for InternedString {
fn from(item: String) -> Self {
InternedString::new(&item)
InternedString::from_cow(item.into())
}
}
@ -72,9 +73,13 @@ impl Eq for InternedString {}
impl InternedString {
pub fn new(str: &str) -> InternedString {
InternedString::from_cow(str.into())
}
fn from_cow<'a>(str: Cow<'a, str>) -> InternedString {
let mut cache = interned_storage();
let s = cache.get(str).copied().unwrap_or_else(|| {
let s = str.to_string().leak();
let s = cache.get(str.as_ref()).copied().unwrap_or_else(|| {
let s = str.into_owned().leak();
cache.insert(s);
s
});