From 76e216f29b44322b52c49d8c56f20763beb271b5 Mon Sep 17 00:00:00 2001
From: Lukas Markeffsky <@>
Date: Sat, 14 Jan 2023 11:48:43 +0100
Subject: Use associated items of `char` instead of freestanding items in
 `core::char`

---
 library/alloc/src/string.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'library/alloc/src/string.rs')

diff --git a/library/alloc/src/string.rs b/library/alloc/src/string.rs
index 3118c7189a5..270e2e34396 100644
--- a/library/alloc/src/string.rs
+++ b/library/alloc/src/string.rs
@@ -42,8 +42,6 @@
 
 #![stable(feature = "rust1", since = "1.0.0")]
 
-#[cfg(not(no_global_oom_handling))]
-use core::char::{decode_utf16, REPLACEMENT_CHARACTER};
 use core::error::Error;
 use core::fmt;
 use core::hash;
@@ -683,7 +681,7 @@ impl String {
         // This isn't done via collect::<Result<_, _>>() for performance reasons.
         // FIXME: the function can be simplified again when #48994 is closed.
         let mut ret = String::with_capacity(v.len());
-        for c in decode_utf16(v.iter().cloned()) {
+        for c in char::decode_utf16(v.iter().cloned()) {
             if let Ok(c) = c {
                 ret.push(c);
             } else {
@@ -722,7 +720,9 @@ impl String {
     #[inline]
     #[stable(feature = "rust1", since = "1.0.0")]
     pub fn from_utf16_lossy(v: &[u16]) -> String {
-        decode_utf16(v.iter().cloned()).map(|r| r.unwrap_or(REPLACEMENT_CHARACTER)).collect()
+        char::decode_utf16(v.iter().cloned())
+            .map(|r| r.unwrap_or(char::REPLACEMENT_CHARACTER))
+            .collect()
     }
 
     /// Decomposes a `String` into its raw components.
-- 
cgit 1.4.1-3-g733a5