Skip to content

Commit 7c8ffea

Browse files
committed
---
yaml --- r: 32408 b: refs/heads/dist-snap c: f7681f9 h: refs/heads/master v: v3
1 parent 9452b89 commit 7c8ffea

File tree

2 files changed

+25
-1
lines changed

2 files changed

+25
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
99
refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
10-
refs/heads/dist-snap: e7fe903d882ba3206016442f2a743ba8369abf97
10+
refs/heads/dist-snap: f7681f9236168cfad661b0ad73798a2d54a941f1
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/libsyntax/parse/parser.rs

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2262,6 +2262,30 @@ struct parser {
22622262
push(bounds, bound_const);
22632263
} else if self.eat_keyword(~"owned") {
22642264
push(bounds, bound_owned);
2265+
} else if is_ident(self.token) {
2266+
// XXX: temporary until kinds become traits
2267+
let maybe_bound = match self.token {
2268+
token::IDENT(sid, _) => {
2269+
match *self.id_to_str(sid) {
2270+
~"Send" => Some(bound_send),
2271+
~"Copy" => Some(bound_copy),
2272+
~"Const" => Some(bound_const),
2273+
~"Owned" => Some(bound_owned),
2274+
_ => None
2275+
}
2276+
}
2277+
_ => fail
2278+
};
2279+
2280+
match maybe_bound {
2281+
Some(bound) => {
2282+
self.bump();
2283+
push(bounds, bound);
2284+
}
2285+
None => {
2286+
push(bounds, bound_trait(self.parse_ty(false)));
2287+
}
2288+
}
22652289
} else {
22662290
push(bounds, bound_trait(self.parse_ty(false)));
22672291
}

0 commit comments

Comments
 (0)