Added a help span which informs the user about the escaping of curly braces in a format string if a wrongly escaped one is detected in a string.
This commit is contained in:
@@ -843,13 +843,19 @@ impl<'a> StringReader<'a> {
|
|||||||
if ascii_only { "unknown byte escape" }
|
if ascii_only { "unknown byte escape" }
|
||||||
else { "unknown character escape" },
|
else { "unknown character escape" },
|
||||||
c);
|
c);
|
||||||
|
let sp = codemap::mk_sp(escaped_pos, last_pos);
|
||||||
if e == '\r' {
|
if e == '\r' {
|
||||||
let sp = codemap::mk_sp(escaped_pos, last_pos);
|
|
||||||
self.span_diagnostic.span_help(
|
self.span_diagnostic.span_help(
|
||||||
sp,
|
sp,
|
||||||
"this is an isolated carriage return; consider checking \
|
"this is an isolated carriage return; consider checking \
|
||||||
your editor and version control settings")
|
your editor and version control settings")
|
||||||
}
|
}
|
||||||
|
if (e == '{' || e == '}') && !ascii_only {
|
||||||
|
self.span_diagnostic.span_help(
|
||||||
|
sp,
|
||||||
|
"if used in a formatting string, \
|
||||||
|
curly braces are escaped with `{{` and `}}`")
|
||||||
|
}
|
||||||
false
|
false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
18
src/test/parse-fail/wrong-escape-of-curly-braces.rs
Normal file
18
src/test/parse-fail/wrong-escape-of-curly-braces.rs
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
|
||||||
|
// file at the top-level directory of this distribution and at
|
||||||
|
// http://rust-lang.org/COPYRIGHT.
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||||
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||||
|
// option. This file may not be copied, modified, or distributed
|
||||||
|
// except according to those terms.
|
||||||
|
|
||||||
|
fn f() {
|
||||||
|
let ok = "{{everything fine}}";
|
||||||
|
let bad = "\{it is wrong\}";
|
||||||
|
//~^ ERROR unknown character escape: {
|
||||||
|
//~^^ HELP if used in a formatting string, curly braces are escaped with `{{` and `}}`
|
||||||
|
//~^^^ ERROR unknown character escape: }
|
||||||
|
//~^^^^ HELP if used in a formatting string, curly braces are escaped with `{{` and `}}`
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user