From 8f4b59c59f3fe3968f9701fa0a1013d7609c34f0 Mon Sep 17 00:00:00 2001
From: Dario Nieuwenhuis <dirbaio@dirbaio.net>
Date: Tue, 31 Oct 2023 02:23:08 +0100
Subject: [PATCH] Fix CI.

---
 src/de.rs     |  3 ++-
 src/ser.rs    |  3 ++-
 src/string.rs | 15 ++++++---------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/de.rs b/src/de.rs
index 24d6750e44..9605227325 100644
--- a/src/de.rs
+++ b/src/de.rs
@@ -1,5 +1,6 @@
 use crate::{
-    binary_heap::Kind as BinaryHeapKind, BinaryHeap, Deque, IndexMap, IndexSet, LinearMap, String, Vec,
+    binary_heap::Kind as BinaryHeapKind, BinaryHeap, Deque, IndexMap, IndexSet, LinearMap, String,
+    Vec,
 };
 use core::{
     fmt,
diff --git a/src/ser.rs b/src/ser.rs
index b6411e4faa..f929ba8b12 100644
--- a/src/ser.rs
+++ b/src/ser.rs
@@ -1,7 +1,8 @@
 use core::hash::{BuildHasher, Hash};
 
 use crate::{
-    binary_heap::Kind as BinaryHeapKind, BinaryHeap, Deque, IndexMap, IndexSet, LinearMap, String, Vec,
+    binary_heap::Kind as BinaryHeapKind, BinaryHeap, Deque, IndexMap, IndexSet, LinearMap, String,
+    Vec,
 };
 use serde::ser::{Serialize, SerializeMap, SerializeSeq, Serializer};
 
diff --git a/src/string.rs b/src/string.rs
index 36a71c4db3..8dc98ed79c 100644
--- a/src/string.rs
+++ b/src/string.rs
@@ -350,7 +350,7 @@ impl<const N: usize> String<N> {
     /// ```
     /// use heapless::String;
     ///
-    /// let mut s: String<8> = String::from("foo");
+    /// let mut s: String<8> = String::try_from("foo").unwrap();
     ///
     /// assert_eq!(s.remove(0), 'f');
     /// assert_eq!(s.remove(1), 'o');
@@ -365,12 +365,9 @@ impl<const N: usize> String<N> {
 
         let next = index + ch.len_utf8();
         let len = self.len();
+        let ptr = self.vec.as_mut_ptr();
         unsafe {
-            core::ptr::copy(
-                self.vec.as_ptr().add(next),
-                self.vec.as_mut_ptr().add(index),
-                len - next,
-            );
+            core::ptr::copy(ptr.add(next), ptr.add(index), len - next);
             self.vec.set_len(len - (next - index));
         }
         ch
@@ -842,14 +839,14 @@ mod tests {
 
     #[test]
     fn remove() {
-        let mut s: String<8> = String::from("foo");
+        let mut s: String<8> = String::try_from("foo").unwrap();
         assert_eq!(s.remove(0), 'f');
         assert_eq!(s.as_str(), "oo");
     }
 
     #[test]
     fn remove_uenc() {
-        let mut s: String<8> = String::from("ĝėēƶ");
+        let mut s: String<8> = String::try_from("ĝėēƶ").unwrap();
         assert_eq!(s.remove(2), 'ė');
         assert_eq!(s.remove(2), 'ē');
         assert_eq!(s.remove(2), 'ƶ');
@@ -858,7 +855,7 @@ mod tests {
 
     #[test]
     fn remove_uenc_combo_characters() {
-        let mut s: String<8> = String::from("héy");
+        let mut s: String<8> = String::try_from("héy").unwrap();
         assert_eq!(s.remove(2), '\u{0301}');
         assert_eq!(s.as_str(), "hey");
     }