diff options
| author | Dylan DPC <dylan.dpc@gmail.com> | 2020-02-23 09:57:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-23 09:57:44 +0100 |
| commit | bdd275de2affa203d5ef4185d32b9b68109e38ca (patch) | |
| tree | 951034622cd33610c5655846b3ff0819df6bc8d7 /src/librustc_parse | |
| parent | ae50725dc3e272a46726f548aaff801a4f456563 (diff) | |
| parent | 20c9a40fec886826a3e7c4ec0c33ea4692f2c6a8 (diff) | |
| download | rust-bdd275de2affa203d5ef4185d32b9b68109e38ca.tar.gz rust-bdd275de2affa203d5ef4185d32b9b68109e38ca.zip | |
Rollup merge of #69375 - Menschenkindlein:master, r=Dylan-DPC
Rename CodeMap to SourceMap follow up See https://github.com/rust-lang/rust/issues/51574
Diffstat (limited to 'src/librustc_parse')
| -rw-r--r-- | src/librustc_parse/parser/expr.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_parse/parser/expr.rs b/src/librustc_parse/parser/expr.rs index 97daa91eed1..3ae97ed5f88 100644 --- a/src/librustc_parse/parser/expr.rs +++ b/src/librustc_parse/parser/expr.rs @@ -1625,10 +1625,10 @@ impl<'a> Parser<'a> { let hi = self.token.span; if require_comma { - let cm = self.sess.source_map(); + let sm = self.sess.source_map(); self.expect_one_of(&[token::Comma], &[token::CloseDelim(token::Brace)]).map_err( |mut err| { - match (cm.span_to_lines(expr.span), cm.span_to_lines(arm_start_span)) { + match (sm.span_to_lines(expr.span), sm.span_to_lines(arm_start_span)) { (Ok(ref expr_lines), Ok(ref arm_start_lines)) if arm_start_lines.lines[0].end_col == expr_lines.lines[0].end_col && expr_lines.lines.len() == 2 |