summaryrefslogtreecommitdiff
path: root/src/parse
diff options
context:
space:
mode:
Diffstat (limited to 'src/parse')
-rw-r--r--src/parse/resolve.rs6
-rw-r--r--src/parse/tokens.rs10
2 files changed, 8 insertions, 8 deletions
diff --git a/src/parse/resolve.rs b/src/parse/resolve.rs
index 7ceac128..80e3bbc0 100644
--- a/src/parse/resolve.rs
+++ b/src/parse/resolve.rs
@@ -29,12 +29,12 @@ pub fn resolve_string(string: &str) -> EcoString {
out.push(c);
} else {
// TODO: Feedback that unicode escape sequence is wrong.
- out += s.eaten_from(start);
+ out.push_str(s.eaten_from(start));
}
}
// TODO: Feedback about invalid escape sequence.
- _ => out += s.eaten_from(start),
+ _ => out.push_str(s.eaten_from(start)),
}
}
@@ -138,7 +138,7 @@ mod tests {
fn test_resolve_strings() {
#[track_caller]
fn test(string: &str, expected: &str) {
- assert_eq!(resolve_string(string), expected.to_string());
+ assert_eq!(resolve_string(string), expected);
}
test(r#"hello world"#, "hello world");
diff --git a/src/parse/tokens.rs b/src/parse/tokens.rs
index acd939e8..684e340e 100644
--- a/src/parse/tokens.rs
+++ b/src/parse/tokens.rs
@@ -606,20 +606,20 @@ mod tests {
}};
(@$mode:ident: $src:expr => $($token:expr),*) => {{
let src = $src;
- let exp = vec![$($token),*];
let found = Tokens::new(&src, $mode).collect::<Vec<_>>();
- check(&src, exp, found);
+ let expected = vec![$($token),*];
+ check(&src, found, expected);
}};
}
#[track_caller]
- fn check<T>(src: &str, exp: T, found: T)
+ fn check<T>(src: &str, found: T, expected: T)
where
T: Debug + PartialEq,
{
- if exp != found {
+ if found != expected {
println!("source: {:?}", src);
- println!("expected: {:#?}", exp);
+ println!("expected: {:#?}", expected);
println!("found: {:#?}", found);
panic!("test failed");
}