diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2013-12-23 16:20:52 +0100 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2014-01-21 15:48:47 -0800 |
| commit | bada25e425ae30583ad343e36a034e59c66fcad6 (patch) | |
| tree | 4e07ddbe72ef54075d401322c8283de064f02b4e /src/libsyntax/parse | |
| parent | aa66b91767ce92c45192ca11718575529d631d21 (diff) | |
| download | rust-bada25e425ae30583ad343e36a034e59c66fcad6.tar.gz rust-bada25e425ae30583ad343e36a034e59c66fcad6.zip | |
[std::vec] Rename .pop_opt() to .pop(), drop the old .pop() behavior
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 30408fa1c2b..4e1703fe6b0 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -2158,7 +2158,7 @@ impl Parser { // Parse the close delimiter. result.push(parse_any_tt_tok(self)); - self.open_braces.pop(); + self.open_braces.pop().unwrap(); TTDelim(@result) } @@ -3593,7 +3593,7 @@ impl Parser { } ); - let variadic = match args.pop_opt() { + let variadic = match args.pop() { Some(None) => true, Some(x) => { // Need to put back that last arg @@ -4218,7 +4218,7 @@ impl Parser { } fn pop_mod_path(&mut self) { - self.mod_path_stack.pop(); + self.mod_path_stack.pop().unwrap(); } // read a module from a source file. |
