user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rollup merge of #69375 - Menschenkindlein:master, r=Dylan-DPC

Browse source 
Rename CodeMap to SourceMap follow up

See https://github.com/rust-lang/rust/issues/51574
This commit is contained in:
Dylan DPC 2020-02-23 09:57:44 +01:00 • committed by GitHub
commit bdd275de2a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 113 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/librustc_parse/parser/expr.rs
View file

@ -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