about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAleksey Kladov <aleksey.kladov@gmail.com>2019-07-03 15:31:59 +0300
committerAleksey Kladov <aleksey.kladov@gmail.com>2019-07-04 09:12:33 +0300
commit3e362a4800932186c7351972753ecdf715050983 (patch)
tree88712a0dd7a9c09491d3fafceed5fc4d1c952546
parent3035a05a74db3a1a7f95e139c4d683cc7be51159 (diff)
downloadrust-3e362a4800932186c7351972753ecdf715050983.tar.gz
rust-3e362a4800932186c7351972753ecdf715050983.zip
make unwrap_or_abort non-generic again
-rw-r--r--src/libsyntax/parse/lexer/mod.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/parse/lexer/mod.rs b/src/libsyntax/parse/lexer/mod.rs
index a56a4ce097e..2ad562485eb 100644
--- a/src/libsyntax/parse/lexer/mod.rs
+++ b/src/libsyntax/parse/lexer/mod.rs
@@ -101,7 +101,7 @@ impl<'a> StringReader<'a> {
         self.override_span.unwrap_or_else(|| Span::new(lo, hi, NO_EXPANSION))
     }
 
-    fn unwrap_or_abort<T>(&mut self, res: Result<T, ()>) -> T {
+    fn unwrap_or_abort(&mut self, res: Result<Token, ()>) -> Token {
         match res {
             Ok(tok) => tok,
             Err(_) => {