Skip to content

Commit 2fe96c9

Browse files
committed
---
yaml --- r: 29806 b: refs/heads/incoming c: 30e243a h: refs/heads/master v: v3
1 parent 7439d5f commit 2fe96c9

File tree

3 files changed

+35
-1
lines changed

3 files changed

+35
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
9-
refs/heads/incoming: 81e6bb1b4bd5c3ad93da6151b52fa0dbf7c5c98a
9+
refs/heads/incoming: 30e243a5aa876153081d5451e14286b00ad2c8b1
1010
refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libsyntax/parse/parser.rs

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3119,6 +3119,30 @@ class parser {
31193119
return iovi_item(self.mk_item(lo, self.last_span.hi, ident, item_,
31203120
visibility,
31213121
maybe_append(attrs, extra_attrs)));
3122+
} else if self.eat_keyword(~"use") {
3123+
let view_item = self.parse_use();
3124+
return iovi_view_item(@{
3125+
node: view_item,
3126+
attrs: attrs,
3127+
vis: visibility,
3128+
span: mk_sp(lo, self.last_span.hi)
3129+
});
3130+
} else if self.eat_keyword(~"import") {
3131+
let view_paths = self.parse_view_paths();
3132+
return iovi_view_item(@{
3133+
node: view_item_import(view_paths),
3134+
attrs: attrs,
3135+
vis: visibility,
3136+
span: mk_sp(lo, self.last_span.hi)
3137+
});
3138+
} else if self.eat_keyword(~"export") {
3139+
let view_paths = self.parse_view_paths();
3140+
return iovi_view_item(@{
3141+
node: view_item_export(view_paths),
3142+
attrs: attrs,
3143+
vis: visibility,
3144+
span: mk_sp(lo, self.last_span.hi)
3145+
});
31223146
} else if !self.is_any_keyword(copy self.token)
31233147
&& self.look_ahead(1) == token::NOT
31243148
&& is_plain_ident(self.look_ahead(2)) {
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
use std;
2+
3+
fn f() {
4+
}
5+
6+
import std::io::println; //~ ERROR view items must be declared at the top
7+
8+
fn main() {
9+
}
10+

0 commit comments

Comments
 (0)