---

yaml
---
r: 30828
b: refs/heads/incoming
c: 0bcb3bc
h: refs/heads/master
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: 459fe6ad558e58db68d622ceacb79e3e8f95c35b
+refs/heads/incoming: 0bcb3bc536ec30a7a15c276de8e3c3c1e4643e1e
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libsyntax/ast.rs

@@ -1485,7 +1485,8 @@ type foreign_item =
      attrs: ~[attribute],
      node: foreign_item_,
      id: node_id,
-     span: span};
+     span: span,
+     vis: visibility};
 
 #[auto_serialize]
 enum foreign_item_ {

branches/incoming/src/libsyntax/fold.rs

@@ -203,7 +203,8 @@ fn noop_fold_foreign_item(&&ni: @foreign_item, fld: ast_fold)
                 }
               },
           id: fld.new_id(ni.id),
-          span: fld.new_span(ni.span)};
+          span: fld.new_span(ni.span),
+          vis: ni.vis};
 }
 
 fn noop_fold_item(&&i: @item, fld: ast_fold) -> Option<@item> {

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

@@ -2227,11 +2227,17 @@ impl parser {
         }
 
         let lo = self.span.lo;
-        let us = self.eat_keyword(~"unsafe");
-        self.expect(token::LBRACE);
-        let {inner, next} = maybe_parse_inner_attrs_and_next(self,
-                                                             parse_attrs);
-        return (inner, self.parse_block_tail_(lo, if us { unsafe_blk } else { default_blk }, next));
+        if self.eat_keyword(~"unsafe") {
+            self.expect(token::LBRACE);
+            let {inner, next} = maybe_parse_inner_attrs_and_next(self,
+                                                                 parse_attrs);
+            return (inner, self.parse_block_tail_(lo, unsafe_blk, next));
+        } else {
+            self.expect(token::LBRACE);
+            let {inner, next} = maybe_parse_inner_attrs_and_next(self,
+                                                                 parse_attrs);
+            return (inner, self.parse_block_tail_(lo, default_blk, next));
+        }
     }
 
     fn parse_block_no_value() -> blk {
@@ -2934,7 +2940,8 @@ impl parser {
         (id, item_mod(m), Some(inner_attrs.inner))
     }
 
-    fn parse_item_foreign_fn(+attrs: ~[attribute]) -> @foreign_item {
+    fn parse_item_foreign_fn(vis: ast::visibility,
+                             +attrs: ~[attribute]) -> @foreign_item {
         let lo = self.span.lo;
         let purity = self.parse_fn_purity();
         let t = self.parse_fn_header();
@@ -2945,10 +2952,12 @@ impl parser {
                  attrs: attrs,
                  node: foreign_item_fn(decl, purity, t.tps),
                  id: self.get_id(),
-                 span: mk_sp(lo, hi)};
+                 span: mk_sp(lo, hi),
+                 vis: vis};
     }
 
-    fn parse_item_foreign_const(+attrs: ~[attribute]) -> @foreign_item {
+    fn parse_item_foreign_const(vis: ast::visibility,
+                                +attrs: ~[attribute]) -> @foreign_item {
         let lo = self.span.lo;
         self.expect_keyword(~"const");
         let ident = self.parse_ident();
@@ -2960,7 +2969,8 @@ impl parser {
                  attrs: attrs,
                  node: foreign_item_const(move ty),
                  id: self.get_id(),
-                 span: mk_sp(lo, hi)};
+                 span: mk_sp(lo, hi),
+                 vis: vis};
     }
 
     fn parse_fn_purity() -> purity {
@@ -2976,10 +2986,11 @@ impl parser {
     }
 
     fn parse_foreign_item(+attrs: ~[attribute]) -> @foreign_item {
+        let vis = self.parse_visibility();
         if self.is_keyword(~"const") {
-            self.parse_item_foreign_const(move attrs)
+            self.parse_item_foreign_const(vis, move attrs)
         } else {
-            self.parse_item_foreign_fn(move attrs)
+            self.parse_item_foreign_fn(vis, move attrs)
         }
     }