---

yaml
---
r: 30223
b: refs/heads/incoming
c: 340a219
h: refs/heads/master
i:
  30221: bd90b29
  30219: 1ceddaf
  30215: 7b1e9a9
  30207: a02edb7
v: v3

Author: pcwalton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: c3fdc8c7b56fe8e786801b87f809ddc2f51eea42
+refs/heads/incoming: 340a21929024efedec5dfa8d4c6a14df41640f78
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

@@ -3423,12 +3423,19 @@ struct parser {
     }
 
     fn is_view_item() -> bool {
-        let tok = if !self.is_keyword(~"pub") && !self.is_keyword(~"priv") {
-            self.token
-        } else { self.look_ahead(1u) };
+        let tok, next_tok;
+        if !self.is_keyword(~"pub") && !self.is_keyword(~"priv") {
+            tok = self.token;
+            next_tok = self.look_ahead(1);
+        } else {
+            tok = self.look_ahead(1);
+            next_tok = self.look_ahead(2);
+        };
         self.token_is_keyword(~"use", tok)
             || self.token_is_keyword(~"import", tok)
             || self.token_is_keyword(~"export", tok)
+            || (self.token_is_keyword(~"extern", tok) &&
+                self.token_is_keyword(~"mod", next_tok))
     }
 
     fn parse_view_item(+attrs: ~[attribute]) -> @view_item {
@@ -3439,7 +3446,14 @@ struct parser {
             view_item_import(self.parse_view_paths())
         } else if self.eat_keyword(~"export") {
             view_item_export(self.parse_view_paths())
-        } else { fail; };
+        } else if self.eat_keyword(~"extern") {
+            self.expect_keyword(~"mod");
+            let ident = self.parse_ident();
+            let metadata = self.parse_optional_meta();
+            view_item_use(ident, metadata, self.get_id())
+        } else {
+            fail;
+        };
         self.expect(token::SEMI);
         @{node: node, attrs: attrs,
           vis: vis, span: mk_sp(lo, self.last_span.hi)}
@@ -3564,7 +3578,8 @@ struct parser {
         } else if self.is_view_item() {
             let vi = self.parse_view_item(outer_attrs);
             return spanned(lo, vi.span.hi, cdir_view_item(vi));
-        } else { return self.fatal(~"expected crate directive"); }
+        }
+        return self.fatal(~"expected crate directive");
     }
 
     fn parse_crate_directives(term: token::token,