auto merge of #10696 : fhahn/rust/issue9543-remove-extern-mod-foo, r=pcwalton

[rust.git] / src / librustc / front / std_inject.rs

diff --git a/src/librustc/front/std_inject.rs b/src/librustc/front/std_inject.rs
index 51b65bcce41ca85c0ae2b210c5046164489ec41a..cebf42eff111aabbe6ded39fae5c3d963b12aaf4 100644 (file)
--- a/src/librustc/front/std_inject.rs
+++ b/src/librustc/front/std_inject.rs
@@ -14,7 +14,7 @@
 use std::vec;
 use syntax::ast;
 use syntax::attr;
-use syntax::codemap::dummy_sp;
+use syntax::codemap::DUMMY_SP;
 use syntax::codemap;
 use syntax::fold::ast_fold;
 use syntax::fold;
@@ -47,7 +47,7 @@ fn no_prelude(attrs: &[ast::Attribute]) -> bool {
 fn spanned<T>(x: T) -> codemap::Spanned<T> {
     codemap::Spanned {
         node: x,
-        span: dummy_sp(),
+        span: DUMMY_SP,
     }
 }
 
@@ -64,7 +64,7 @@ fn fold_crate(&mut self, crate: ast::Crate) -> ast::Crate {
                                             ast::DUMMY_NODE_ID),
             attrs: ~[],
             vis: ast::private,
-            span: dummy_sp()
+            span: DUMMY_SP
         }];
 
         if use_uv(&crate) && !self.sess.building_library.get() {
@@ -75,7 +75,7 @@ fn fold_crate(&mut self, crate: ast::Crate) -> ast::Crate {
                                                 ast::DUMMY_NODE_ID),
                 attrs: ~[],
                 vis: ast::private,
-                span: dummy_sp()
+                span: DUMMY_SP
             });
             vis.push(ast::view_item {
                 node: ast::view_item_extern_mod(self.sess.ident_of("rustuv"),
@@ -84,7 +84,7 @@ fn fold_crate(&mut self, crate: ast::Crate) -> ast::Crate {
                                                 ast::DUMMY_NODE_ID),
                 attrs: ~[],
                 vis: ast::private,
-                span: dummy_sp()
+                span: DUMMY_SP
             });
         }
 
@@ -119,7 +119,7 @@ fn fold_item(&mut self, item: @ast::item) -> SmallVector<@ast::item> {
 
     fn fold_mod(&mut self, module: &ast::_mod) -> ast::_mod {
         let prelude_path = ast::Path {
-            span: dummy_sp(),
+            span: DUMMY_SP,
             global: false,
             segments: ~[
                 ast::PathSegment {
@@ -141,7 +141,7 @@ fn fold_mod(&mut self, module: &ast::_mod) -> ast::_mod {
             node: ast::view_item_use(~[vp]),
             attrs: ~[],
             vis: ast::private,
-            span: dummy_sp(),
+            span: DUMMY_SP,
         };
 
         let vis = vec::append(~[vi2], module.view_items);