about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-05-05 03:56:34 +0000
committerbors <bors@rust-lang.org>2017-05-05 03:56:34 +0000
commita6ab049ed1db09f693df7d33046b3980f56751c1 (patch)
tree50a28372fab8299ce5a03cb645aa17f54bc6b7dd /src/libsyntax
parent50b98587180a44782b22cbde1f638b61193ef7a3 (diff)
parent3cd7f37482ddf7c2b34f50cf157b55cc8ac4140e (diff)
downloadrust-a6ab049ed1db09f693df7d33046b3980f56751c1.tar.gz
rust-a6ab049ed1db09f693df7d33046b3980f56751c1.zip
Auto merge of #41762 - frewsxcv:rollup, r=frewsxcv
Rollup of 4 pull requests

- Successful merges: #41741, #41746, #41749, #41754
- Failed merges:
Diffstat (limited to 'src/libsyntax')
-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 c2e5763237d..7d2a1b3c4a4 100644
--- a/src/libsyntax/parse/lexer/mod.rs
+++ b/src/libsyntax/parse/lexer/mod.rs
@@ -73,7 +73,7 @@ fn mk_sp(lo: BytePos, hi: BytePos) -> Span {
 }
 
 impl<'a> StringReader<'a> {
-    fn next_token(&mut self) -> TokenAndSpan where Self: Sized {
+    fn next_token(&mut self) -> TokenAndSpan {
         let res = self.try_next_token();
         self.unwrap_or_abort(res)
     }