diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2017-01-19 15:49:49 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2017-01-20 08:35:49 -0800 |
| commit | 465a0d12b9777dde1e10e758924ce1d4837a4517 (patch) | |
| tree | 764532478d4454379b80b175bc4ef720ce4c6fc3 | |
| parent | f1852650d91ca09e78fca2b6b24758bdbc521f5e (diff) | |
| parent | 853f6974767243e2e5defb43f5f7195ce1fb1cc7 (diff) | |
| download | rust-465a0d12b9777dde1e10e758924ce1d4837a4517.tar.gz rust-465a0d12b9777dde1e10e758924ce1d4837a4517.zip | |
Rollup merge of #39179 - petrochenkov:objparen, r=eddyb
Fix regression in parsing of trait object types Fixes https://github.com/rust-lang/rust/issues/39169 Accepting parens in this position is a regression itself, introduced in Rust 1.6 by https://github.com/rust-lang/rust/pull/29870, so I hope to revert this in my next bounds refactoring patch (possibly with a warning, crater run, etc). r? @eddyb
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 11 | ||||
| -rw-r--r-- | src/test/parse-fail/bounds-obj-parens.rs | 15 |
2 files changed, 24 insertions, 2 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index fd6abc58b63..5dd772041e2 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -1236,10 +1236,17 @@ impl<'a> Parser<'a> { "at least one type parameter bound \ must be specified"); } - if let TyKind::Path(None, ref path) = lhs.node { + + let mut lhs = lhs.unwrap(); + if let TyKind::Paren(ty) = lhs.node { + // We have to accept the first bound in parens for backward compatibility. + // Example: `(Bound) + Bound + Bound` + lhs = ty.unwrap(); + } + if let TyKind::Path(None, path) = lhs.node { let poly_trait_ref = PolyTraitRef { bound_lifetimes: Vec::new(), - trait_ref: TraitRef { path: path.clone(), ref_id: lhs.id }, + trait_ref: TraitRef { path: path, ref_id: lhs.id }, span: lhs.span, }; let poly_trait_ref = TraitTyParamBound(poly_trait_ref, TraitBoundModifier::None); diff --git a/src/test/parse-fail/bounds-obj-parens.rs b/src/test/parse-fail/bounds-obj-parens.rs new file mode 100644 index 00000000000..cbdffb4a255 --- /dev/null +++ b/src/test/parse-fail/bounds-obj-parens.rs @@ -0,0 +1,15 @@ +// Copyright 2017 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. + +// compile-flags: -Z parse-only + +type A = Box<(Fn(D::Error) -> E) + 'static + Send + Sync>; // OK + +FAIL //~ ERROR |