diff options
| author | Oliver Schneider <git1984941651981@oli-obk.de> | 2015-03-20 08:19:13 +0100 |
|---|---|---|
| committer | Oliver Schneider <git1984941651981@oli-obk.de> | 2015-03-20 08:19:13 +0100 |
| commit | b4a1e59146c70a12d8c4c1f85c08a2ecf9fb3d2e (patch) | |
| tree | 7b986ee36f81d3566200a9acda28c20b5921e032 /src/libsyntax/parse/lexer/mod.rs | |
| parent | 0084f92302b3352372bfd14ebbf083bae695d16e (diff) | |
| download | rust-b4a1e59146c70a12d8c4c1f85c08a2ecf9fb3d2e.tar.gz rust-b4a1e59146c70a12d8c4c1f85c08a2ecf9fb3d2e.zip | |
don't use Result::ok just to be able to use unwrap/unwrap_or
Diffstat (limited to 'src/libsyntax/parse/lexer/mod.rs')
| -rw-r--r-- | src/libsyntax/parse/lexer/mod.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/parse/lexer/mod.rs b/src/libsyntax/parse/lexer/mod.rs index bb8f9da8917..e0953a8ace6 100644 --- a/src/libsyntax/parse/lexer/mod.rs +++ b/src/libsyntax/parse/lexer/mod.rs @@ -623,7 +623,7 @@ impl<'a> StringReader<'a> { // find the integer representing the name self.scan_digits(base); let encoded_name : u32 = self.with_str_from(start_bpos, |s| { - num::from_str_radix(s, 10).ok().unwrap_or_else(|| { + num::from_str_radix(s, 10).unwrap_or_else(|_| { panic!("expected digits representing a name, got {:?}, {}, range [{:?},{:?}]", s, whence, start_bpos, self.last_pos); }) @@ -641,7 +641,7 @@ impl<'a> StringReader<'a> { let start_bpos = self.last_pos; self.scan_digits(base); let encoded_ctxt : ast::SyntaxContext = self.with_str_from(start_bpos, |s| { - num::from_str_radix(s, 10).ok().unwrap_or_else(|| { + num::from_str_radix(s, 10).unwrap_or_else(|_| { panic!("expected digits representing a ctxt, got {:?}, {}", s, whence); }) }); |