Simplify str::clone_into

DaniPopes · DaniPopes · commit 0351c5316c0b · 2024-06-25T22:34:41.000+02:00
Removes an `unsafe` in favor of just using `String` methods.
diff --git a/alloc/src/str.rs b/alloc/src/str.rs
@@ -206,15 +206,16 @@ impl BorrowMut<str> for String {
 #[stable(feature = "rust1", since = "1.0.0")]
 impl ToOwned for str {
     type Owned = String;
+
     #[inline]
     fn to_owned(&self) -> String {
         unsafe { String::from_utf8_unchecked(self.as_bytes().to_owned()) }
     }
 
+    #[inline]
     fn clone_into(&self, target: &mut String) {
-        let mut b = mem::take(target).into_bytes();
-        self.as_bytes().clone_into(&mut b);
-        *target = unsafe { String::from_utf8_unchecked(b) }
+        target.clear();
+        target.push_str(self);
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -206,15 +206,16 @@ impl BorrowMut<str> for String {`
`206`	`206`	`#[stable(feature = "rust1", since = "1.0.0")]`
`207`	`207`	`impl ToOwned for str {`
`208`	`208`	`type Owned = String;`
	`209`	`+`
`209`	`210`	`#[inline]`
`210`	`211`	`fn to_owned(&self) -> String {`
`211`	`212`	`unsafe { String::from_utf8_unchecked(self.as_bytes().to_owned()) }`
`212`	`213`	`}`
`213`	`214`
	`215`	`+ #[inline]`
`214`	`216`	`fn clone_into(&self, target: &mut String) {`
`215`		`- let mut b = mem::take(target).into_bytes();`
`216`		`- self.as_bytes().clone_into(&mut b);`
`217`		`- *target = unsafe { String::from_utf8_unchecked(b) }`
	`217`	`+ target.clear();`
	`218`	`+ target.push_str(self);`
`218`	`219`	`}`
`219`	`220`	`}`
`220`	`221`