diff options
| author | Brian Anderson <banderson@mozilla.com> | 2012-09-21 19:37:57 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-09-23 17:15:00 -0700 |
| commit | 4a78f9b16620489855da93c19be56f59431416f6 (patch) | |
| tree | 4b164738698203f474003682d5f0a5e23aa13377 /src/libsyntax/parse | |
| parent | 92752a462a055d6478bd96dab37a740514992106 (diff) | |
| download | rust-4a78f9b16620489855da93c19be56f59431416f6.tar.gz rust-4a78f9b16620489855da93c19be56f59431416f6.zip | |
core: Demode option
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/lexer.rs | 4 | ||||
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libsyntax/parse/lexer.rs b/src/libsyntax/parse/lexer.rs index c32aaa3d474..c9b10c7b754 100644 --- a/src/libsyntax/parse/lexer.rs +++ b/src/libsyntax/parse/lexer.rs @@ -364,7 +364,7 @@ fn scan_number(c: char, rdr: string_reader) -> token::token { if str::len(num_str) == 0u { rdr.fatal(~"no valid digits found for number"); } - let parsed = option::get(u64::from_str_radix(num_str, base as u64)); + let parsed = u64::from_str_radix(num_str, base as u64).get(); match tp { either::Left(t) => return token::LIT_INT(parsed as i64, t), either::Right(t) => return token::LIT_UINT(parsed, t) @@ -412,7 +412,7 @@ fn scan_number(c: char, rdr: string_reader) -> token::token { if str::len(num_str) == 0u { rdr.fatal(~"no valid digits found for number"); } - let parsed = option::get(u64::from_str_radix(num_str, base as u64)); + let parsed = u64::from_str_radix(num_str, base as u64).get(); debug!("lexing %s as an unsuffixed integer literal", num_str); diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index f2e7245a1d4..490808edaad 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -2743,7 +2743,7 @@ impl parser { token_to_str(self.reader, self.token))); } - let actual_dtor = do option::map(the_dtor) |dtor| { + let actual_dtor = do the_dtor.map |dtor| { let (d_body, d_attrs, d_s) = dtor; {node: {id: self.get_id(), attrs: d_attrs, @@ -3111,7 +3111,7 @@ impl parser { } } self.bump(); - let mut actual_dtor = do option::map(the_dtor) |dtor| { + let mut actual_dtor = do the_dtor.map |dtor| { let (d_body, d_attrs, d_s) = dtor; {node: {id: self.get_id(), attrs: d_attrs, |