make unwrap_or_abort non-generic again

matklad · matklad · commit 3e362a480093 · 2019-07-04T09:12:33.000+03:00
diff --git 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(_) => {

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ impl<'a> StringReader<'a> {`
`101`	`101`	`self.override_span.unwrap_or_else(\|\| Span::new(lo, hi, NO_EXPANSION))`
`102`	`102`	`}`
`103`	`103`
`104`		`- fn unwrap_or_abort<T>(&mut self, res: Result<T, ()>) -> T {`
	`104`	`+ fn unwrap_or_abort(&mut self, res: Result<Token, ()>) -> Token {`
`105`	`105`	`match res {`
`106`	`106`	`Ok(tok) => tok,`
`107`	`107`	`Err(_) => {`