Eco string 🌱

2 files changed, 9 insertions, 7 deletions

diff --git a/src/parse/mod.rs b/src/parse/mod.rs
index c3d532a7..4c2fd129 100644
--- a/src/parse/mod.rs
+++ b/src/parse/mod.rs
@@ -15,6 +15,7 @@ pub use tokens::*;
 use std::rc::Rc;
 
 use crate::diag::Pass;
+use crate::eco::EcoString;
 use crate::syntax::*;
 
 /// Parse a string of source code.
@@ -151,10 +152,10 @@ fn node(p: &mut Parser, at_start: &mut bool) -> Option<Node> {
 }
 
 /// Handle a unicode escape sequence.
-fn unicode_escape(p: &mut Parser, token: UnicodeEscapeToken) -> String {
+fn unicode_escape(p: &mut Parser, token: UnicodeEscapeToken) -> EcoString {
     let span = p.peek_span();
     let text = if let Some(c) = resolve::resolve_hex(token.sequence) {
-        c.to_string()
+        c.into()
     } else {
         // Print out the escape sequence verbatim if it is invalid.
         p.diag(error!(span, "invalid unicode escape sequence"));
@@ -774,7 +775,7 @@ fn ident(p: &mut Parser) -> Option<Ident> {
     if let Some(Token::Ident(string)) = p.peek() {
         Some(Ident {
             span: p.eat_span(),
-            string: string.to_string(),
+            string: string.into(),
         })
     } else {
         p.expected("identifier");
diff --git a/src/parse/resolve.rs b/src/parse/resolve.rs
index b3fdef4a..c3676215 100644
--- a/src/parse/resolve.rs
+++ b/src/parse/resolve.rs
@@ -1,9 +1,10 @@
 use super::{is_newline, Scanner};
+use crate::eco::EcoString;
 use crate::syntax::{Ident, RawNode, Span};
 
 /// Resolve all escape sequences in a string.
-pub fn resolve_string(string: &str) -> String {
-    let mut out = String::with_capacity(string.len());
+pub fn resolve_string(string: &str) -> EcoString {
+    let mut out = EcoString::with_capacity(string.len());
     let mut s = Scanner::new(string);
 
     while let Some(c) = s.eat() {
@@ -52,12 +53,12 @@ pub fn resolve_raw(span: Span, text: &str, backticks: usize) -> RawNode {
         let (tag, inner) = split_at_lang_tag(text);
         let (text, block) = trim_and_split_raw(inner);
         let lang = Ident::new(tag, span.start .. span.start + tag.len());
-        RawNode { span, lang, text, block }
+        RawNode { span, lang, text: text.into(), block }
     } else {
         RawNode {
             span,
             lang: None,
-            text: split_lines(text).join("\n"),
+            text: split_lines(text).join("\n").into(),
             block: false,
         }
     }