---

yaml
---
r: 151163
b: refs/heads/try2
c: ac170b1
h: refs/heads/master
i:
  151161: 4320f97
  151159: 5324772
v: v3

Author: aochagavia

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: a1ad41b93d133aa4f3bda71475f8e41d9dfe704d
+refs/heads/try2: ac170b100e13f81543d8512d2b0b1c70d4217596
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/front/config.rs

@@ -70,7 +70,6 @@ fn fold_mod(cx: &mut Context, m: &ast::Mod) -> ast::Mod {
         filter_view_item(cx, a).map(|x| cx.fold_view_item(x))
     }).collect();
     ast::Mod {
-        inner: m.inner,
         view_items: filtered_view_items,
         items: flattened_items
     }

branches/try2/src/librustc/front/test.rs

@@ -143,7 +143,6 @@ impl<'a> fold::Folder for TestHarnessGenerator<'a> {
         }
 
         let mod_nomain = ast::Mod {
-            inner: m.inner,
             view_items: m.view_items.clone(),
             items: m.items.iter().map(|i| nomain(&self.cx, *i)).collect(),
         };
@@ -336,7 +335,6 @@ fn mk_test_module(cx: &TestCtxt) -> @ast::Item {
     )).unwrap();
 
     let testmod = ast::Mod {
-        inner: DUMMY_SP,
         view_items: view_items,
         items: vec!(mainfn, tests),
     };

branches/try2/src/librustdoc/clean.rs

@@ -227,27 +227,10 @@ impl Clean<Item> for doctree::Module {
             self.view_items.clean().move_iter().collect(),
             self.macros.clean().move_iter().collect()
         );
-
-        // determine if we should display the inner contents or
-        // the outer `mod` item for the source code.
-        let where = {
-            let ctxt = local_data::get(super::ctxtkey, |x| *x.unwrap());
-            let cm = ctxt.sess().codemap();
-            let outer = cm.lookup_char_pos(self.where_outer.lo);
-            let inner = cm.lookup_char_pos(self.where_inner.lo);
-            if outer.file.start_pos == inner.file.start_pos {
-                // mod foo { ... }
-                self.where_outer
-            } else {
-                // mod foo; (and a separate FileMap for the contents)
-                self.where_inner
-            }
-        };
-
         Item {
             name: Some(name),
             attrs: self.attrs.clean(),
-            source: where.clean(),
+            source: self.where.clean(),
             visibility: self.vis.clean(),
             id: self.id,
             inner: ModuleItem(Module {

branches/try2/src/librustdoc/doctree.rs

@@ -19,8 +19,7 @@ use syntax::ast::{Ident, NodeId};
 pub struct Module {
     pub name: Option<Ident>,
     pub attrs: Vec<ast::Attribute>,
-    pub where_outer: Span,
-    pub where_inner: Span,
+    pub where: Span,
     pub structs: Vec<Struct>,
     pub enums: Vec<Enum>,
     pub fns: Vec<Function>,
@@ -43,8 +42,7 @@ impl Module {
             name       : name,
             id: 0,
             vis: ast::Inherited,
-            where_outer: syntax::codemap::DUMMY_SP,
-            where_inner: syntax::codemap::DUMMY_SP,
+            where: syntax::codemap::DUMMY_SP,
             attrs      : Vec::new(),
             structs    : Vec::new(),
             enums      : Vec::new(),

branches/try2/src/librustdoc/visit_ast.rs

@@ -118,8 +118,7 @@ impl<'a> RustdocVisitor<'a> {
         for item in m.view_items.iter() {
             self.visit_view_item(item, &mut om);
         }
-        om.where_outer = span;
-        om.where_inner = m.inner;
+        om.where = span;
         om.attrs = attrs;
         om.vis = vis;
         om.id = id;

branches/try2/src/libstd/vec.rs

@@ -1288,7 +1288,7 @@ impl<T:Eq> Vec<T> {
             //     +---+---+---+---+---+---+
             //           w
             //
-            // Comparing self[r] against self[w-1], tis is not a duplicate, so
+            // Comparing self[r] against self[w-1], this is not a duplicate, so
             // we swap self[r] and self[w] (no effect as r==w) and then increment both
             // r and w, leaving us with:
             //

branches/try2/src/libsyntax/ast.rs

@@ -921,12 +921,8 @@ pub struct Method {
 
 #[deriving(Clone, Eq, TotalEq, Encodable, Decodable, Hash)]
 pub struct Mod {
-    /// A span from the first token past `{` to the last token until `}`.
-    /// For `mod foo;`, the inner span ranges from the first token
-    /// to the last token in the external file.
-    pub inner: Span,
-    pub view_items: Vec<ViewItem>,
-    pub items: Vec<@Item>,
+    pub view_items: Vec<ViewItem> ,
+    pub items: Vec<@Item> ,
 }
 
 #[deriving(Clone, Eq, TotalEq, Encodable, Decodable, Hash)]
@@ -1169,15 +1165,7 @@ mod test {
     fn check_asts_encodable() {
         use std::io;
         let e = Crate {
-            module: Mod {
-                inner: Span {
-                    lo: BytePos(11),
-                    hi: BytePos(19),
-                    expn_info: None,
-                },
-                view_items: Vec::new(),
-                items: Vec::new(),
-            },
+            module: Mod {view_items: Vec::new(), items: Vec::new()},
             attrs: Vec::new(),
             config: Vec::new(),
             span: Span {

branches/try2/src/libsyntax/ext/build.rs

@@ -220,7 +220,7 @@ pub trait AstBuilder {
                         generics: Generics) -> @ast::Item;
     fn item_struct(&self, span: Span, name: Ident, struct_def: ast::StructDef) -> @ast::Item;
 
-    fn item_mod(&self, span: Span, inner_span: Span,
+    fn item_mod(&self, span: Span,
                 name: Ident, attrs: Vec<ast::Attribute> ,
                 vi: Vec<ast::ViewItem> , items: Vec<@ast::Item> ) -> @ast::Item;
 
@@ -898,7 +898,7 @@ impl<'a> AstBuilder for ExtCtxt<'a> {
         self.item(span, name, Vec::new(), ast::ItemStruct(@struct_def, generics))
     }
 
-    fn item_mod(&self, span: Span, inner_span: Span, name: Ident,
+    fn item_mod(&self, span: Span, name: Ident,
                 attrs: Vec<ast::Attribute> ,
                 vi: Vec<ast::ViewItem> ,
                 items: Vec<@ast::Item> ) -> @ast::Item {
@@ -907,7 +907,6 @@ impl<'a> AstBuilder for ExtCtxt<'a> {
             name,
             attrs,
             ast::ItemMod(ast::Mod {
-                inner: inner_span,
                 view_items: vi,
                 items: items,
             })

branches/try2/src/libsyntax/fold.rs

@@ -652,7 +652,6 @@ pub fn noop_fold_type_method<T: Folder>(m: &TypeMethod, fld: &mut T) -> TypeMeth
 
 pub fn noop_fold_mod<T: Folder>(m: &Mod, folder: &mut T) -> Mod {
     ast::Mod {
-        inner: folder.new_span(m.inner),
         view_items: m.view_items
                      .iter()
                      .map(|x| folder.fold_view_item(x)).collect(),

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

@@ -4036,8 +4036,7 @@ impl<'a> Parser<'a> {
     // attributes (of length 0 or 1), parse all of the items in a module
     fn parse_mod_items(&mut self,
                        term: token::Token,
-                       first_item_attrs: Vec<Attribute>,
-                       inner_lo: BytePos)
+                       first_item_attrs: Vec<Attribute> )
                        -> Mod {
         // parse all of the items up to closing or an attribute.
         // view items are legal here.
@@ -4082,11 +4081,7 @@ impl<'a> Parser<'a> {
             self.span_err(self.last_span, "expected item after attributes");
         }
 
-        ast::Mod {
-            inner: mk_sp(inner_lo, self.span.lo),
-            view_items: view_items,
-            items: items
-        }
+        ast::Mod { view_items: view_items, items: items }
     }
 
     fn parse_item_const(&mut self) -> ItemInfo {
@@ -4112,9 +4107,8 @@ impl<'a> Parser<'a> {
         } else {
             self.push_mod_path(id, outer_attrs);
             self.expect(&token::LBRACE);
-            let mod_inner_lo = self.span.lo;
             let (inner, next) = self.parse_inner_attrs_and_next();
-            let m = self.parse_mod_items(token::RBRACE, next, mod_inner_lo);
+            let m = self.parse_mod_items(token::RBRACE, next);
             self.expect(&token::RBRACE);
             self.pop_mod_path();
             (id, ItemMod(m), Some(inner))
@@ -4203,11 +4197,10 @@ impl<'a> Parser<'a> {
                                      self.cfg.clone(),
                                      &path,
                                      id_sp);
-        let mod_inner_lo = p0.span.lo;
         let (inner, next) = p0.parse_inner_attrs_and_next();
         let mod_attrs = outer_attrs.append(inner.as_slice());
         let first_item_outer_attrs = next;
-        let m0 = p0.parse_mod_items(token::EOF, first_item_outer_attrs, mod_inner_lo);
+        let m0 = p0.parse_mod_items(token::EOF, first_item_outer_attrs);
         self.sess.included_mod_stack.borrow_mut().pop();
         return (ast::ItemMod(m0), mod_attrs);
     }
@@ -5068,7 +5061,7 @@ impl<'a> Parser<'a> {
         let (inner, next) = self.parse_inner_attrs_and_next();
         let first_item_outer_attrs = next;
         // parse the items inside the crate:
-        let m = self.parse_mod_items(token::EOF, first_item_outer_attrs, lo);
+        let m = self.parse_mod_items(token::EOF, first_item_outer_attrs);
 
         ast::Crate {
             module: m,