about summary refs log tree commit diff
path: root/src/libsyntax/parse
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-03-11 20:51:56 -0700
committerbors <bors@rust-lang.org>2014-03-11 20:51:56 -0700
commit8a32ee7444f9d9e3b8ea38ead0814cf13dd6e7cc (patch)
tree0a921cac31f073e12b612d769d37f5d023c683f5 /src/libsyntax/parse
parent0aa3b888568661eabd9994ad902eff8d44d59261 (diff)
parent7b4ee5cce70b9976c96e1bee06493ad44037b000 (diff)
downloadrust-8a32ee7444f9d9e3b8ea38ead0814cf13dd6e7cc.tar.gz
rust-8a32ee7444f9d9e3b8ea38ead0814cf13dd6e7cc.zip
auto merge of #12774 : alexcrichton/rust/proc-bounds, r=pcwalton
This is needed to make progress on #10296 as the default bounds will no longer
include Send. I believe that this was the originally intended syntax for procs,
and it just hasn't been necessary up until now.
Diffstat (limited to 'src/libsyntax/parse')
-rw-r--r--src/libsyntax/parse/parser.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 6fbf5f071ad..c8bd87024e8 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -893,13 +893,14 @@ impl Parser {
     // Parses a procedure type (`proc`). The initial `proc` keyword must
     // already have been parsed.
     pub fn parse_proc_type(&mut self) -> Ty_ {
+        let bounds = self.parse_optional_ty_param_bounds();
         let (decl, lifetimes) = self.parse_ty_fn_decl(false);
         TyClosure(@ClosureTy {
             sigil: OwnedSigil,
             region: None,
             purity: ImpureFn,
             onceness: Once,
-            bounds: None,
+            bounds: bounds,
             decl: decl,
             lifetimes: lifetimes,
         })