Use push_str() instead of extend()

This commit is contained in:
Yuheng Chen 2016-11-24 18:10:49 +08:00
parent 7e5f273d99
commit 864c7e0829

View file

@ -1082,11 +1082,11 @@ impl<T: Iterator<Item=char>> Scanner<T> {
} }
leading_break.clear(); leading_break.clear();
} else { } else {
string.extend(leading_break.chars()); string.push_str(&leading_break);
leading_break.clear(); leading_break.clear();
} }
string.extend(trailing_breaks.chars()); string.push_str(&trailing_breaks);
trailing_breaks.clear(); trailing_breaks.clear();
leading_blank = is_blank(self.ch()); leading_blank = is_blank(self.ch());
@ -1108,11 +1108,11 @@ impl<T: Iterator<Item=char>> Scanner<T> {
// Chomp the tail. // Chomp the tail.
if chomping != -1 { if chomping != -1 {
string.extend(leading_break.chars()); string.push_str(&leading_break);
} }
if chomping == 1 { if chomping == 1 {
string.extend(trailing_breaks.chars()); string.push_str(&trailing_breaks);
} }
if literal { if literal {
@ -1327,21 +1327,21 @@ impl<T: Iterator<Item=char>> Scanner<T> {
// Join the whitespaces or fold line breaks. // Join the whitespaces or fold line breaks.
if leading_blanks { if leading_blanks {
if leading_break.is_empty() { if leading_break.is_empty() {
string.extend(leading_break.chars()); string.push_str(&leading_break);
string.extend(trailing_breaks.chars()); string.push_str(&trailing_breaks);
trailing_breaks.clear(); trailing_breaks.clear();
leading_break.clear(); leading_break.clear();
} else { } else {
if trailing_breaks.is_empty() { if trailing_breaks.is_empty() {
string.push(' '); string.push(' ');
} else { } else {
string.extend(trailing_breaks.chars()); string.push_str(&trailing_breaks);
trailing_breaks.clear(); trailing_breaks.clear();
} }
leading_break.clear(); leading_break.clear();
} }
} else { } else {
string.extend(whitespaces.chars()); string.push_str(&whitespaces);
whitespaces.clear(); whitespaces.clear();
} }
} // loop } // loop
@ -1408,15 +1408,15 @@ impl<T: Iterator<Item=char>> Scanner<T> {
if leading_blanks || !whitespaces.is_empty() { if leading_blanks || !whitespaces.is_empty() {
if leading_blanks { if leading_blanks {
if leading_break.is_empty() { if leading_break.is_empty() {
string.extend(leading_break.chars()); string.push_str(&leading_break);
string.extend(trailing_breaks.chars()); string.push_str(&trailing_breaks);
trailing_breaks.clear(); trailing_breaks.clear();
leading_break.clear(); leading_break.clear();
} else { } else {
if trailing_breaks.is_empty() { if trailing_breaks.is_empty() {
string.push(' '); string.push(' ');
} else { } else {
string.extend(trailing_breaks.chars()); string.push_str(&trailing_breaks);
trailing_breaks.clear(); trailing_breaks.clear();
} }
leading_break.clear(); leading_break.clear();
@ -1424,7 +1424,7 @@ impl<T: Iterator<Item=char>> Scanner<T> {
} }
leading_blanks = false; leading_blanks = false;
} else { } else {
string.extend(whitespaces.chars()); string.push_str(&whitespaces);
whitespaces.clear(); whitespaces.clear();
} }
} }