diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2018-08-23 10:14:52 +0200 |
|---|---|---|
| committer | Matthias Krüger <matthias.krueger@famsik.de> | 2018-08-23 10:14:52 +0200 |
| commit | ede1f7d2a5a2f4038e3f3b2e953c44ee5ea06194 (patch) | |
| tree | cdaa95ead9a05ae228478333ccd15b88ac115ea7 /src/libsyntax | |
| parent | e73077e10603b3586828f2d3d067f804c2fc0a1f (diff) | |
| download | rust-ede1f7d2a5a2f4038e3f3b2e953c44ee5ea06194.tar.gz rust-ede1f7d2a5a2f4038e3f3b2e953c44ee5ea06194.zip | |
use String::new() instead of String::from(""), "".to_string(), "".to_owned() or "".into()
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ext/source_util.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/parse/lexer/comments.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 14 | ||||
| -rw-r--r-- | src/libsyntax/source_map.rs | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/libsyntax/ext/source_util.rs b/src/libsyntax/ext/source_util.rs index 19a204cc989..e4b9e3216b1 100644 --- a/src/libsyntax/ext/source_util.rs +++ b/src/libsyntax/ext/source_util.rs @@ -184,7 +184,7 @@ pub fn expand_include_bytes(cx: &mut ExtCtxt, sp: Span, tts: &[tokenstream::Toke Ok(..) => { // Add this input file to the code map to make it available as // dependency information, but don't enter it's contents - cx.source_map().new_source_file(file.into(), "".to_string()); + cx.source_map().new_source_file(file.into(), String::new()); base::MacEager::expr(cx.expr_lit(sp, ast::LitKind::ByteStr(Lrc::new(bytes)))) } diff --git a/src/libsyntax/parse/lexer/comments.rs b/src/libsyntax/parse/lexer/comments.rs index dde0466f43c..172a48ddba2 100644 --- a/src/libsyntax/parse/lexer/comments.rs +++ b/src/libsyntax/parse/lexer/comments.rs @@ -230,7 +230,7 @@ fn trim_whitespace_prefix_and_push_line(lines: &mut Vec<String>, s: String, col: if col < len { (&s[col..len]).to_string() } else { - "".to_string() + String::new() } } None => s, diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index e85b5dca2b7..74f6a65cc26 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -684,7 +684,7 @@ impl<'a> Parser<'a> { let mut i = tokens.iter(); // This might be a sign we need a connect method on Iterator. let b = i.next() - .map_or("".to_string(), |t| t.to_string()); + .map_or(String::new(), |t| t.to_string()); i.enumerate().fold(b, |mut b, (i, a)| { if tokens.len() > 2 && i == tokens.len() - 2 { b.push_str(", or "); @@ -786,7 +786,7 @@ impl<'a> Parser<'a> { } else { err.span_label(self.span, "expected identifier"); if self.token == token::Comma && self.look_ahead(1, |t| t.is_ident()) { - err.span_suggestion(self.span, "remove this comma", "".into()); + err.span_suggestion(self.span, "remove this comma", String::new()); } } err @@ -2506,7 +2506,7 @@ impl<'a> Parser<'a> { err.span_suggestion_short_with_applicability( self.span, "remove this comma", - "".to_owned(), + String::new(), Applicability::MachineApplicable ); err.note("the base struct must always be the last field"); @@ -3473,7 +3473,7 @@ impl<'a> Parser<'a> { e.span_suggestion_short_with_applicability( match_span, "try removing this `match`", - "".to_owned(), + String::new(), Applicability::MaybeIncorrect // speculative ); } @@ -3850,7 +3850,7 @@ impl<'a> Parser<'a> { if self.token == token::CloseDelim(token::Brace) { // If the struct looks otherwise well formed, recover and continue. if let Some(sp) = comma_sp { - err.span_suggestion_short(sp, "remove this comma", "".into()); + err.span_suggestion_short(sp, "remove this comma", String::new()); } err.emit(); break; @@ -3890,7 +3890,7 @@ impl<'a> Parser<'a> { err.multipart_suggestion( "move the `..` to the end of the field list", vec![ - (etc_span, "".into()), + (etc_span, String::new()), (self.span, format!("{}.. }}", if ate_comma { "" } else { ", " })), ], ); @@ -6190,7 +6190,7 @@ impl<'a> Parser<'a> { if token_str == ";" { let msg = "consider removing this semicolon"; err.span_suggestion_short_with_applicability( - self.span, msg, "".to_string(), Applicability::MachineApplicable + self.span, msg, String::new(), Applicability::MachineApplicable ); if !items.is_empty() { // Issue #51603 let previous_item = &items[items.len()-1]; diff --git a/src/libsyntax/source_map.rs b/src/libsyntax/source_map.rs index c65931a8577..8f91db8efa7 100644 --- a/src/libsyntax/source_map.rs +++ b/src/libsyntax/source_map.rs @@ -1030,7 +1030,7 @@ mod tests { cm.new_source_file(PathBuf::from("blork.rs").into(), "first line.\nsecond line".to_string()); cm.new_source_file(PathBuf::from("empty.rs").into(), - "".to_string()); + String::new()); cm.new_source_file(PathBuf::from("blork2.rs").into(), "first line.\nsecond line".to_string()); cm |
