dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #111656 - finnbear:string_leak_unbounded_lifetime, r=Amanieu 

Use an unbounded lifetime in `String::leak`.

Using `'a` instead of `'static` is predicted to make the process of making `String` generic over an allocator easier/less of a breaking change.

See:
- https://github.com/rust-lang/rust/pull/109814#issuecomment-1550164195
- https://github.com/rust-lang/rust/pull/109814#issuecomment-1550250163

ACP: https://github.com/rust-lang/libs-team/issues/109
This commit is contained in:
Matthias Krüger 2023-05-27 20:40:29 +02:00 committed by GitHub
parent 97fae38bf9 f0c9c1eb19
commit 5a4c04cc2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/alloc/src/string.rs
View File

@ -1851,7 +1851,7 @@ impl String {
} }
/// Consumes and leaks the `String`, returning a mutable reference to the contents, /// Consumes and leaks the `String`, returning a mutable reference to the contents,
/// `&'static mut str`. /// `&'a mut str`.
/// ///
/// This is mainly useful for data that lives for the remainder of /// This is mainly useful for data that lives for the remainder of
/// the program's life. Dropping the returned reference will cause a memory /// the program's life. Dropping the returned reference will cause a memory
@ -1874,7 +1874,7 @@ impl String {
/// ``` /// ```
#[unstable(feature = "string_leak", issue = "102929")] #[unstable(feature = "string_leak", issue = "102929")]
#[inline] #[inline]
pub fn leak(self) -> &'static mut str { pub fn leak<'a>(self) -> &'a mut str {
let slice = self.vec.leak(); let slice = self.vec.leak();
unsafe { from_utf8_unchecked_mut(slice) } unsafe { from_utf8_unchecked_mut(slice) }
} }