From a1c5f8839dd972a016e4fd6af3a898c1d8f2684f Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Wed, 27 Jul 2022 06:56:09 +0200
Subject: Use `ToString` for `Text::new` instead of `Into<String>`

---
 examples/counter/src/main.rs   |  2 +-
 examples/websocket/src/echo.rs | 15 ++++++++-------
 native/src/widget/helpers.rs   |  2 +-
 native/src/widget/text.rs      |  4 ++--
 src/lib.rs                     |  2 +-
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/examples/counter/src/main.rs b/examples/counter/src/main.rs
index f5ba7fae..13dcbf86 100644
--- a/examples/counter/src/main.rs
+++ b/examples/counter/src/main.rs
@@ -40,7 +40,7 @@ impl Sandbox for Counter {
     fn view(&self) -> Element<Message> {
         column![
             button("Increment").on_press(Message::IncrementPressed),
-            text(self.value.to_string()).size(50),
+            text(self.value).size(50),
             button("Decrement").on_press(Message::DecrementPressed)
         ]
         .padding(20)
diff --git a/examples/websocket/src/echo.rs b/examples/websocket/src/echo.rs
index 88321880..ae65e064 100644
--- a/examples/websocket/src/echo.rs
+++ b/examples/websocket/src/echo.rs
@@ -8,6 +8,7 @@ use futures::sink::SinkExt;
 use futures::stream::StreamExt;
 
 use async_tungstenite::tungstenite;
+use std::fmt;
 
 pub fn connect() -> Subscription<Event> {
     struct Connect;
@@ -63,7 +64,7 @@ pub fn connect() -> Subscription<Event> {
                         }
 
                         message = input.select_next_some() => {
-                            let result = websocket.send(tungstenite::Message::Text(String::from(message))).await;
+                            let result = websocket.send(tungstenite::Message::Text(message.to_string())).await;
 
                             if result.is_ok() {
                                 (None, State::Connected(websocket, input))
@@ -133,14 +134,14 @@ impl Message {
     }
 }
 
-impl From<Message> for String {
-    fn from(message: Message) -> Self {
-        match message {
-            Message::Connected => String::from("Connected successfully!"),
+impl fmt::Display for Message {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Message::Connected => write!(f, "Connected successfully!"),
             Message::Disconnected => {
-                String::from("Connection lost... Retrying...")
+                write!(f, "Connection lost... Retrying...")
             }
-            Message::User(message) => message,
+            Message::User(message) => write!(f, "{}", message),
         }
     }
 }
diff --git a/native/src/widget/helpers.rs b/native/src/widget/helpers.rs
index 648aab5f..a0d39943 100644
--- a/native/src/widget/helpers.rs
+++ b/native/src/widget/helpers.rs
@@ -107,7 +107,7 @@ where
 /// Creates a new [`Text`] widget with the provided content.
 ///
 /// [`Text`]: widget::Text
-pub fn text<Renderer>(text: impl Into<String>) -> widget::Text<Renderer>
+pub fn text<Renderer>(text: impl ToString) -> widget::Text<Renderer>
 where
     Renderer: crate::text::Renderer,
     Renderer::Theme: widget::text::StyleSheet,
diff --git a/native/src/widget/text.rs b/native/src/widget/text.rs
index 26386505..b30f4518 100644
--- a/native/src/widget/text.rs
+++ b/native/src/widget/text.rs
@@ -45,9 +45,9 @@ where
     Renderer::Theme: StyleSheet,
 {
     /// Create a new fragment of [`Text`] with the given contents.
-    pub fn new<T: Into<String>>(label: T) -> Self {
+    pub fn new<T: ToString>(label: T) -> Self {
         Text {
-            content: label.into(),
+            content: label.to_string(),
             size: None,
             font: Default::default(),
             width: Length::Shrink,
diff --git a/src/lib.rs b/src/lib.rs
index 96ee4eb5..38ba48be 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -94,7 +94,7 @@
 //!             button("+").on_press(Message::IncrementPressed),
 //!
 //!             // We show the value of the counter here
-//!             text(self.value.to_string()).size(50),
+//!             text(self.value).size(50),
 //!
 //!             // The decrement button. We tell it to produce a
 //!             button("-").on_press(Message::DecrementPressed),
-- 
cgit