diff options
| author | bors <bors@rust-lang.org> | 2015-07-12 22:05:59 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-07-12 22:05:59 +0000 |
| commit | 05d8767289351a6111c77a5dfa8ba35468f721f6 (patch) | |
| tree | 35b1118660802f381b7a09380cd01501e6fa109e /src/libsyntax/parse | |
| parent | adcae006d250e40d7369d9bee3ecd05915acb22d (diff) | |
| parent | ed472c8e0dc0e26e48fd875e2cf08042546c2706 (diff) | |
| download | rust-05d8767289351a6111c77a5dfa8ba35468f721f6.tar.gz rust-05d8767289351a6111c77a5dfa8ba35468f721f6.zip | |
Auto merge of #26957 - wesleywiser:rename_connect_to_join, r=alexcrichton
Fixes #26900
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/lexer/comments.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/parse/lexer/comments.rs b/src/libsyntax/parse/lexer/comments.rs index 1577b50ad76..467345624c2 100644 --- a/src/libsyntax/parse/lexer/comments.rs +++ b/src/libsyntax/parse/lexer/comments.rs @@ -139,7 +139,7 @@ pub fn strip_doc_comment_decoration(comment: &str) -> String { let lines = vertical_trim(lines); let lines = horizontal_trim(lines); - return lines.connect("\n"); + return lines.join("\n"); } panic!("not a doc-comment: {}", comment); diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 81ae607fea2..d77b529a3bf 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -5215,7 +5215,7 @@ impl<'a> Parser<'a> { last_span, &format!("illegal ABI: expected one of [{}], \ found `{}`", - abi::all_names().connect(", "), + abi::all_names().join(", "), the_string)); Ok(None) } |
