diff options
| author | bors <bors@rust-lang.org> | 2018-03-06 15:01:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-03-06 15:01:21 +0000 |
| commit | 2789b067da2ac921b86199bde21dd231ace1da39 (patch) | |
| tree | d39a80c2778ced0f9437ade7f4e76ef51e364bfa /src/libsyntax_ext | |
| parent | b977e044a7485a95852bfce12f1054bcc673355d (diff) | |
| parent | 8e3493d45924fdb869c37dcb992759f71defed7c (diff) | |
| download | rust-2789b067da2ac921b86199bde21dd231ace1da39.tar.gz rust-2789b067da2ac921b86199bde21dd231ace1da39.zip | |
Auto merge of #48768 - kennytm:rollup, r=kennytm
Rollup of 14 pull requests - Successful merges: #48403, #48432, #48546, #48573, #48590, #48657, #48727, #48732, #48753, #48754, #48761, #48474, #48507, #47463 - Failed merges:
Diffstat (limited to 'src/libsyntax_ext')
| -rw-r--r-- | src/libsyntax_ext/format.rs | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/libsyntax_ext/format.rs b/src/libsyntax_ext/format.rs index a7822414c69..8fd95aa1ca8 100644 --- a/src/libsyntax_ext/format.rs +++ b/src/libsyntax_ext/format.rs @@ -732,18 +732,13 @@ pub fn expand_preparsed_format_args(ecx: &mut ExtCtxt, let mut parser = parse::Parser::new(fmt_str); let mut pieces = vec![]; - loop { - match parser.next() { - Some(mut piece) => { - if !parser.errors.is_empty() { - break; - } - cx.verify_piece(&piece); - cx.resolve_name_inplace(&mut piece); - pieces.push(piece); - } - None => break, + while let Some(mut piece) = parser.next() { + if !parser.errors.is_empty() { + break; } + cx.verify_piece(&piece); + cx.resolve_name_inplace(&mut piece); + pieces.push(piece); } let numbered_position_args = pieces.iter().any(|arg: &parse::Piece| { |
