OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix incorrect position of chars in fmt str

This commit is contained in:
Esteban Küber 2018-07-20 09:15:22 -07:00
parent 85da68cb6d
commit 052159be53
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/libfmt_macros/lib.rs
View File

@ -169,10 +169,9 @@ impl<'a> Iterator for Parser<'a> {
if let Some(&(pos, c)) = self.cur.peek() {
match c {
'{' => {
let pos = pos + raw + 1;
self.cur.next();
if self.consume('{') {
Some(String(self.string(pos)))
Some(String(self.string(pos + 1)))
} else {
let ret = Some(NextArgument(self.argument()));
self.must_consume('}');
@ -180,17 +179,17 @@ impl<'a> Iterator for Parser<'a> {
}
}
'}' => {
let pos = pos + raw + 1;
self.cur.next();
if self.consume('}') {
Some(String(self.string(pos)))
Some(String(self.string(pos + 1)))
} else {
let err_pos = pos + raw + 1;
self.err_with_note(
"unmatched `}` found",
"unmatched `}`",
"if you intended to print `}`, you can escape it using `}}`",
pos,
pos,
err_pos,
err_pos,
);
None
}
@ -283,15 +282,17 @@ impl<'a> Parser<'a> {
syntax::ast::StrStyle::Raw(raw) => raw as usize,
_ => 0,
};
let padding = raw + self.seen_newlines;
if let Some(&(pos, maybe)) = self.cur.peek() {
if c == maybe {
self.cur.next();
} else {
let pos = pos + padding + 1;
self.err(format!("expected `{:?}`, found `{:?}`", c, maybe),
format!("expected `{}`", c),
pos + padding + 1,
pos + padding + 1);
pos,
pos);
}
} else {
let msg = format!("expected `{:?}` but string was terminated", c);