bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Include parens to type parameter

Browse source
This commit is contained in:
Seiichi Uchida 2018-04-27 17:32:54 +09:00 • committed by Seiichi Uchida
parent 2a0062974a
commit 78a19d9b88
2 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/libsyntax/parse/parser.rs
View file

@ -4875,6 +4875,7 @@ impl<'a> Parser<'a> {
self.check_keyword(keywords::For) || self.check_keyword(keywords::For) ||
self.check(&token::OpenDelim(token::Paren)); self.check(&token::OpenDelim(token::Paren));
if is_bound_start { if is_bound_start {
let lo = self.span;
let has_parens = self.eat(&token::OpenDelim(token::Paren)); let has_parens = self.eat(&token::OpenDelim(token::Paren));
let question = if self.eat(&token::Question) { Some(self.prev_span) } else { None }; let question = if self.eat(&token::Question) { Some(self.prev_span) } else { None };
if self.token.is_lifetime() { if self.token.is_lifetime() {
@ -4883,10 +4884,15 @@ impl<'a> Parser<'a> {
"`?` may only modify trait bounds, not lifetime bounds"); "`?` may only modify trait bounds, not lifetime bounds");
} }
bounds.push(RegionTyParamBound(self.expect_lifetime())); bounds.push(RegionTyParamBound(self.expect_lifetime()));
if has_parens {
self.expect(&token::CloseDelim(token::Paren))?;
}
} else { } else {
let lo = self.span;
let lifetime_defs = self.parse_late_bound_lifetime_defs()?; let lifetime_defs = self.parse_late_bound_lifetime_defs()?;
let path = self.parse_path(PathStyle::Type)?; let path = self.parse_path(PathStyle::Type)?;
if has_parens {
self.expect(&token::CloseDelim(token::Paren))?;
}
let poly_trait = PolyTraitRef::new(lifetime_defs, path, lo.to(self.prev_span)); let poly_trait = PolyTraitRef::new(lifetime_defs, path, lo.to(self.prev_span));
let modifier = if question.is_some() { let modifier = if question.is_some() {
TraitBoundModifier::Maybe TraitBoundModifier::Maybe
@ -4896,7 +4902,6 @@ impl<'a> Parser<'a> {
bounds.push(TraitTyParamBound(poly_trait, modifier)); bounds.push(TraitTyParamBound(poly_trait, modifier));
} }
if has_parens { if has_parens {
self.expect(&token::CloseDelim(token::Paren))?;
if let Some(&RegionTyParamBound(..)) = bounds.last() { if let Some(&RegionTyParamBound(..)) = bounds.last() {
self.span_err(self.prev_span, self.span_err(self.prev_span,
"parenthesized lifetime bounds are not supported"); "parenthesized lifetime bounds are not supported");

12
src/test/ui/maybe-bounds.stderr
View file

@ -1,22 +1,22 @@
error: `?Trait` is not permitted in supertraits error: `?Trait` is not permitted in supertraits
--> $DIR/maybe-bounds.rs:11:12 --> $DIR/maybe-bounds.rs:11:11
| |
LL | trait Tr: ?Sized {} //~ ERROR `?Trait` is not permitted in supertraits LL | trait Tr: ?Sized {} //~ ERROR `?Trait` is not permitted in supertraits
| ^^^^^ | ^^^^^^
| |
= note: traits are `?Sized` by default = note: traits are `?Sized` by default
error: `?Trait` is not permitted in trait object types error: `?Trait` is not permitted in trait object types
--> $DIR/maybe-bounds.rs:13:17 --> $DIR/maybe-bounds.rs:13:16
| |
LL | type A1 = Tr + ?Sized; //~ ERROR `?Trait` is not permitted in trait object types LL | type A1 = Tr + ?Sized; //~ ERROR `?Trait` is not permitted in trait object types
| ^^^^^ | ^^^^^^
error: `?Trait` is not permitted in trait object types error: `?Trait` is not permitted in trait object types
--> $DIR/maybe-bounds.rs:14:25 --> $DIR/maybe-bounds.rs:14:24
| |
LL | type A2 = for<'a> Tr + ?Sized; //~ ERROR `?Trait` is not permitted in trait object types LL | type A2 = for<'a> Tr + ?Sized; //~ ERROR `?Trait` is not permitted in trait object types
| ^^^^^ | ^^^^^^
error: aborting due to 3 previous errors error: aborting due to 3 previous errors