diff options
author | bors <bors@rust-lang.org> | 2016-11-13 09:53:30 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-13 09:53:30 -0800 |
commit | 876b7610100a6609db04be010144062f582cfb8c (patch) | |
tree | 79e5d8147b4dc1d710e063e511cee1fcbac0c21f | |
parent | ea02f87daab14fff71af751c8e3f66b689cac3cd (diff) | |
parent | 34f33ec789297716995045f7067aeb4d77947d89 (diff) | |
download | rust-876b7610100a6609db04be010144062f582cfb8c.tar.gz |
Auto merge of #37753 - est31:master, r=petrochenkov
Fix empty lifetime list or one with trailing comma being rejected
Fixes #37733
-rw-r--r-- | src/libsyntax/parse/parser.rs | 6 | ||||
-rw-r--r-- | src/test/run-pass/issue-37733.rs | 15 |
2 files changed, 18 insertions, 3 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 7d15334ff9f..c3f8a79c1cc 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -1902,12 +1902,12 @@ impl<'a> Parser<'a> { if let Some(recv) = followed_by_ty_params { assert!(recv.is_empty()); *recv = attrs; - } else { + debug!("parse_lifetime_defs ret {:?}", res); + return Ok(res); + } else if !attrs.is_empty() { let msg = "trailing attribute after lifetime parameters"; return Err(self.fatal(msg)); } - debug!("parse_lifetime_defs ret {:?}", res); - return Ok(res); } } diff --git a/src/test/run-pass/issue-37733.rs b/src/test/run-pass/issue-37733.rs new file mode 100644 index 00000000000..358b93254de --- /dev/null +++ b/src/test/run-pass/issue-37733.rs @@ -0,0 +1,15 @@ +// Copyright 2016 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or +// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license +// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +type A = for<> fn(); + +type B = for<'a,> fn(); + +pub fn main() {} |