Skip to content

Commit 876b761

Browse files
authored
Auto merge of #37753 - est31:master, r=petrochenkov
Fix empty lifetime list or one with trailing comma being rejected Fixes #37733
2 parents ea02f87 + 34f33ec commit 876b761

File tree

2 files changed

+18
-3
lines changed

2 files changed

+18
-3
lines changed

src/libsyntax/parse/parser.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1902,12 +1902,12 @@ impl<'a> Parser<'a> {
19021902
if let Some(recv) = followed_by_ty_params {
19031903
assert!(recv.is_empty());
19041904
*recv = attrs;
1905-
} else {
1905+
debug!("parse_lifetime_defs ret {:?}", res);
1906+
return Ok(res);
1907+
} else if !attrs.is_empty() {
19061908
let msg = "trailing attribute after lifetime parameters";
19071909
return Err(self.fatal(msg));
19081910
}
1909-
debug!("parse_lifetime_defs ret {:?}", res);
1910-
return Ok(res);
19111911
}
19121912
}
19131913

src/test/run-pass/issue-37733.rs

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
type A = for<> fn();
12+
13+
type B = for<'a,> fn();
14+
15+
pub fn main() {}

0 commit comments

Comments
 (0)