diff options
| author | Victor Berger <victor.berger@m4x.org> | 2014-12-15 00:14:18 +0100 |
|---|---|---|
| committer | Victor Berger <victor.berger@m4x.org> | 2014-12-18 10:31:20 +0100 |
| commit | 58825221124db0edbdecef6a331a872a5e20dacb (patch) | |
| tree | 77966d31bc473eb9dcc2355d714b5d9066e65f18 /src/parser.rs | |
| parent | 944b94c21a064d0b1ad80ccabf12d95726c72139 (diff) | |
| download | milf-rs-58825221124db0edbdecef6a331a872a5e20dacb.tar.gz milf-rs-58825221124db0edbdecef6a331a872a5e20dacb.zip | |
Update to last rust.
Diffstat (limited to 'src/parser.rs')
| -rw-r--r-- | src/parser.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/parser.rs b/src/parser.rs index 7b910d3..9143673 100644 --- a/src/parser.rs +++ b/src/parser.rs @@ -81,7 +81,7 @@ impl<'a> Parser<'a> { } fn next_pos(&self) -> uint { - self.cur.clone().next().map(|p| p.val0()).unwrap_or(self.input.len()) + self.cur.clone().next().map(|p| p.0).unwrap_or(self.input.len()) } // Returns true and consumes the next character if it matches `ch`, @@ -96,8 +96,8 @@ impl<'a> Parser<'a> { fn expect(&mut self, ch: char) -> bool { if self.eat(ch) { return true } let mut it = self.cur.clone(); - let lo = it.next().map(|p| p.val0()).unwrap_or(self.input.len()); - let hi = it.next().map(|p| p.val0()).unwrap_or(self.input.len()); + let lo = it.next().map(|p| p.0).unwrap_or(self.input.len()); + let hi = it.next().map(|p| p.0).unwrap_or(self.input.len()); self.errors.push(ParserError { lo: lo, hi: hi, @@ -258,8 +258,8 @@ impl<'a> Parser<'a> { Some((pos, ch)) if ch.is_digit(10) => self.number_or_datetime(pos), _ => { let mut it = self.cur.clone(); - let lo = it.next().map(|p| p.val0()).unwrap_or(self.input.len()); - let hi = it.next().map(|p| p.val0()).unwrap_or(self.input.len()); + let lo = it.next().map(|p| p.0).unwrap_or(self.input.len()); + let hi = it.next().map(|p| p.0).unwrap_or(self.input.len()); self.errors.push(ParserError { lo: lo, hi: hi, @@ -624,8 +624,8 @@ impl<'a> Parser<'a> { } } - fn recurse<'a>(&mut self, mut cur: &'a mut TomlTable, orig_key: &'a str, - key_lo: uint) -> Option<(&'a mut TomlTable, &'a str)> { + fn recurse<'b>(&mut self, mut cur: &'b mut TomlTable, orig_key: &'b str, + key_lo: uint) -> Option<(&'b mut TomlTable, &'b str)> { if orig_key.starts_with(".") || orig_key.ends_with(".") || orig_key.contains("..") { self.errors.push(ParserError { |