librustc: Remove "extern mod { ... }" from librustc, librustdoc, and tests. rs=deexterning

Author: pcwalton

src/libcore/libc.rs

@@ -1139,8 +1139,8 @@ pub mod funcs {
                 unsafe fn strxfrm(s: *c_char, ct: *c_char, n: size_t)
                                -> size_t;
 
-                // These are fine to execute on the Rust stack. They must be, in
-                // fact, because LLVM generates calls to them!
+                // These are fine to execute on the Rust stack. They must be,
+                // in fact, because LLVM generates calls to them!
                 #[rust_stack]
                 #[inline(always)]
                 unsafe fn memcpy(s: *c_void, ct: *c_void, n: size_t)

src/librustc/back/link.rs

@@ -94,10 +94,12 @@ pub mod jit {
     use core::ptr;
     use core::str;
 
-    #[nolink]
-    #[abi = "rust-intrinsic"]
-    pub extern mod rusti {
-        pub fn morestack_addr() -> *();
+    pub mod rusti {
+        #[nolink]
+        #[abi = "rust-intrinsic"]
+        pub extern {
+            pub fn morestack_addr() -> *();
+        }
     }
 
     pub struct Closure {

src/librustc/front/intrinsic.rs

@@ -122,9 +122,13 @@ pub mod intrinsic {
         fn visit_closure_ptr(&self, ck: uint) -> bool;
     }
 
-    #[abi = "rust-intrinsic"]
-    pub extern mod rusti {
-        pub fn get_tydesc<T>() -> *();
-        pub fn visit_tydesc(++td: *TyDesc, &&tv: TyVisitor);
+    pub mod rusti {
+        use super::{TyDesc, TyVisitor};
+
+        #[abi = "rust-intrinsic"]
+        pub extern {
+            pub fn get_tydesc<T>() -> *();
+            pub fn visit_tydesc(++td: *TyDesc, &&tv: TyVisitor);
+        }
     }
 }

src/librustc/lib/llvm.rs

@@ -135,15 +135,9 @@ fn should_extract_top_mod_attributes() {
     assert doc.cratemod().desc() == Some(~"test");
 }
 
-#[test]
-fn should_extract_foreign_mod_attributes() {
-    let doc = test::mk_doc(~"#[doc = \"test\"] extern mod a { }");
-    assert doc.cratemod().nmods()[0].desc() == Some(~"test");
-}
-
 #[test]
 fn should_extract_foreign_fn_attributes() {
-    let doc = test::mk_doc(~"extern mod a { #[doc = \"test\"] fn a(); }");
+    let doc = test::mk_doc(~"extern { #[doc = \"test\"] fn a(); }");
     assert doc.cratemod().nmods()[0].fns[0].desc() == Some(~"test");
 }
 

src/librustdoc/attr_pass.rs

@@ -371,15 +371,9 @@ mod test {
         assert doc.cratemod().mods()[0].mods()[1].name() == ~"c";
     }
 
-    #[test]
-    pub fn extract_foreign_mods() {
-        let doc = mk_doc(~"extern mod a { }");
-        assert doc.cratemod().nmods()[0].name() == ~"a";
-    }
-
     #[test]
     pub fn extract_fns_from_foreign_mods() {
-        let doc = mk_doc(~"extern mod a { fn a(); }");
+        let doc = mk_doc(~"extern { fn a(); }");
         assert doc.cratemod().nmods()[0].fns[0].name() == ~"a";
     }
 

src/librustdoc/extract.rs

@@ -169,18 +169,6 @@ fn should_remove_mods_from_containing_mods() {
     assert vec::is_empty(doc.cratemod().mods());
 }
 
-#[test]
-fn should_make_a_page_for_every_foreign_mod() {
-    let doc = test::mk_doc(~"extern mod a { }");
-    assert doc.pages.nmods()[0].name() == ~"a";
-}
-
-#[test]
-fn should_remove_foreign_mods_from_containing_mods() {
-    let doc = test::mk_doc(~"extern mod a { }");
-    assert vec::is_empty(doc.cratemod().nmods());
-}
-
 #[cfg(test)]
 mod test {
     use astsrv;

src/librustdoc/page_pass.rs

@@ -115,22 +115,3 @@ fn should_record_fn_paths() {
     }
 }
 
-#[test]
-fn should_record_foreign_mod_paths() {
-    let source = ~"mod a { extern mod b { } }";
-    do astsrv::from_str(source) |srv| {
-        let doc = extract::from_srv(srv.clone(), ~"");
-        let doc = run(srv.clone(), doc);
-        assert doc.cratemod().mods()[0].nmods()[0].path() == ~[~"a"];
-    }
-}
-
-#[test]
-fn should_record_foreign_fn_paths() {
-    let source = ~"extern mod a { fn b(); }";
-    do astsrv::from_str(source) |srv| {
-        let doc = extract::from_srv(srv.clone(), ~"");
-        let doc = run(srv.clone(), doc);
-        assert doc.cratemod().nmods()[0].fns[0].path() == ~[~"a"];
-    }
-}

src/librustdoc/path_pass.rs

@@ -786,9 +786,11 @@ pub mod rustrt {
         unsafe fn rust_uv_tcp_bind6(tcp_server: *uv_tcp_t,
                                     ++addr: *sockaddr_in6) -> libc::c_int;
         unsafe fn rust_uv_tcp_getpeername(tcp_handle_ptr: *uv_tcp_t,
-                                          ++name: *sockaddr_in) -> libc::c_int;
+                                          ++name: *sockaddr_in)
+                                       -> libc::c_int;
         unsafe fn rust_uv_tcp_getpeername6(tcp_handle_ptr: *uv_tcp_t,
-                                           ++name: *sockaddr_in6) ->libc::c_int;
+                                           ++name: *sockaddr_in6)
+                                        -> libc::c_int;
         unsafe fn rust_uv_listen(stream: *libc::c_void,
                                  backlog: libc::c_int,
                                  cb: *u8) -> libc::c_int;
@@ -852,7 +854,8 @@ pub mod rustrt {
                                               -> *libc::c_void;
         unsafe fn rust_uv_set_data_for_uv_handle(handle: *libc::c_void,
                                                  data: *libc::c_void);
-        unsafe fn rust_uv_get_data_for_req(req: *libc::c_void) -> *libc::c_void;
+        unsafe fn rust_uv_get_data_for_req(req: *libc::c_void)
+                                        -> *libc::c_void;
         unsafe fn rust_uv_set_data_for_req(req: *libc::c_void,
                                            data: *libc::c_void);
         unsafe fn rust_uv_get_base_from_buf(++buf: uv_buf_t) -> *u8;

src/libstd/uv_ll.rs

@@ -8,23 +8,25 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[abi = "rust-intrinsic"]
-pub extern mod rusti {
-    fn atomic_cxchg(dst: &mut int, old: int, src: int) -> int;
-    fn atomic_cxchg_acq(dst: &mut int, old: int, src: int) -> int;
-    fn atomic_cxchg_rel(dst: &mut int, old: int, src: int) -> int;
+pub mod rusti {
+    #[abi = "rust-intrinsic"]
+    pub extern {
+        fn atomic_cxchg(dst: &mut int, old: int, src: int) -> int;
+        fn atomic_cxchg_acq(dst: &mut int, old: int, src: int) -> int;
+        fn atomic_cxchg_rel(dst: &mut int, old: int, src: int) -> int;
 
-    fn atomic_xchg(dst: &mut int, src: int) -> int;
-    fn atomic_xchg_acq(dst: &mut int, src: int) -> int;
-    fn atomic_xchg_rel(dst: &mut int, src: int) -> int;
-    
-    fn atomic_xadd(dst: &mut int, src: int) -> int;
-    fn atomic_xadd_acq(dst: &mut int, src: int) -> int;
-    fn atomic_xadd_rel(dst: &mut int, src: int) -> int;
-    
-    fn atomic_xsub(dst: &mut int, src: int) -> int;
-    fn atomic_xsub_acq(dst: &mut int, src: int) -> int;
-    fn atomic_xsub_rel(dst: &mut int, src: int) -> int;
+        fn atomic_xchg(dst: &mut int, src: int) -> int;
+        fn atomic_xchg_acq(dst: &mut int, src: int) -> int;
+        fn atomic_xchg_rel(dst: &mut int, src: int) -> int;
+        
+        fn atomic_xadd(dst: &mut int, src: int) -> int;
+        fn atomic_xadd_acq(dst: &mut int, src: int) -> int;
+        fn atomic_xadd_rel(dst: &mut int, src: int) -> int;
+        
+        fn atomic_xsub(dst: &mut int, src: int) -> int;
+        fn atomic_xsub_acq(dst: &mut int, src: int) -> int;
+        fn atomic_xsub_rel(dst: &mut int, src: int) -> int;
+    }
 }
 
 #[inline(always)]

src/test/auxiliary/cci_intrinsic.rs

@@ -13,9 +13,11 @@
 
 #[crate_type = "lib"];
 
-pub extern mod rustrt {
-    pub fn rust_dbg_call(cb: *u8,
-                         data: libc::uintptr_t) -> libc::uintptr_t;
+pub mod rustrt {
+    pub extern {
+        pub fn rust_dbg_call(cb: *u8, data: libc::uintptr_t)
+                          -> libc::uintptr_t;
+    }
 }
 
 pub fn fact(n: uint) -> uint {

src/test/auxiliary/extern-crosscrate-source.rs

@@ -10,6 +10,9 @@
 
 #[link(name="foreign_lib", vers="0.0")];
 
-pub extern mod rustrt {
-    pub fn rust_get_argc() -> libc::c_int;
+pub mod rustrt {
+    pub extern {
+        pub fn rust_get_argc() -> libc::c_int;
+    }
 }
+

src/test/auxiliary/foreign_lib.rs

@@ -13,7 +13,9 @@ mod issue_3882 {
         len: libc::size_t,
     }
 
-    extern mod c {
-        fn linenoiseAddCompletion(lc: *mut Completions);
+    mod c {
+        extern {
+            fn linenoiseAddCompletion(lc: *mut Completions);
+        }
     }
 }

src/test/auxiliary/issue_3882.rs

@@ -20,9 +20,11 @@ use core::os;
 // because the the indirection through another dynamic linker
 // stub. Kind of shocking. Might be able to make it faster still with
 // an llvm intrinsic.
-#[nolink]
-extern mod libc {
-    pub fn sqrt(n: float) -> float;
+mod libc {
+    #[nolink]
+    pub extern {
+        pub fn sqrt(n: float) -> float;
+    }
 }
 
 fn main() {

src/test/bench/shootout-nbody.rs

@@ -11,5 +11,5 @@
 // error-pattern:empty #[link_name] not allowed; use #[nolink].
 
 #[link_name = ""]
-extern mod foo {
+extern {
 }

src/test/compile-fail/empty-linkname.rs

@@ -13,5 +13,5 @@
 
 #[link_name = ""]
 #[nolink]
-extern mod foo {
+extern {
 }

src/test/compile-fail/empty-linkname2.rs

@@ -10,9 +10,11 @@
 // except according to those terms.
 
 
-#[abi = "cdecl"]
-extern mod test {
-    pub unsafe fn free();
+mod test {
+    #[abi = "cdecl"]
+    pub extern {
+        pub unsafe fn free();
+    }
 }
 
 fn main() {

src/test/compile-fail/foreign-unsafe-fn-called.rs

@@ -10,9 +10,11 @@
 // except according to those terms.
 
 
-#[abi = "cdecl"]
-extern mod test {
-    pub unsafe fn free();
+mod test {
+    #[abi = "cdecl"]
+    pub extern {
+        pub unsafe fn free();
+    }
 }
 
 fn main() {

src/test/compile-fail/foreign-unsafe-fn.rs

@@ -16,6 +16,6 @@ the compiler output. */
 
 #[link_args = "aFdEfSeVEEE"]
 #[nolink]
-extern mod m1 {}
+extern {}
 
 fn main() { }

src/test/compile-fail/nolink-with-link-args.rs

@@ -18,10 +18,10 @@
 
 #[link_name= "m"]
 #[link_args="-foo"]             // this could have been elided.
-extern mod m1 {
+extern {
 }
 
 #[link_name= "m"]
 #[link_args="-bar"]             // this is the actual error trigger.
-extern mod m2 {
+extern {
 }

src/test/compile-fail/redundant-link-args.rs

@@ -11,9 +11,11 @@
 // error-pattern:found rust type
 #[deny(ctypes)];
 
-#[nolink]
-extern mod libc {
-    pub fn malloc(size: int) -> *u8;
+mod libc {
+    #[nolink]
+    pub extern {
+        pub fn malloc(size: int) -> *u8;
+    }
 }
 
 fn main() {

src/test/compile-fail/warn-ctypes-err-attr.rs

@@ -10,9 +10,11 @@
 
 // compile-flags:-D ctypes
 // error-pattern:found rust type
-#[nolink]
-extern mod libc {
-    pub fn malloc(size: int) -> *u8;
+mod libc {
+    #[nolink]
+    extern {
+        pub fn malloc(size: int) -> *u8;
+    }
 }
 
 fn main() {

src/test/compile-fail/warn-ctypes.rs

@@ -9,9 +9,11 @@
 // except according to those terms.
 
 //error-pattern:libc::c_int or libc::c_long should be used
-extern mod xx {
-    pub fn strlen(str: *u8) -> uint;
-    pub fn foo(x: int, y: uint);
+mod xx {
+    pub extern {
+        pub fn strlen(str: *u8) -> uint;
+        pub fn foo(x: int, y: uint);
+    }
 }
 
 fn main() {

src/test/compile-fail/warn-foreign-int-types.rs

@@ -12,9 +12,11 @@
 // Testing that runtime failure doesn't cause callbacks to abort abnormally.
 // Instead the failure will be delivered after the callbacks return.
 
-extern mod rustrt {
-    pub fn rust_dbg_call(cb: *u8,
-                         data: libc::uintptr_t) -> libc::uintptr_t;
+mod rustrt {
+    pub extern {
+        pub fn rust_dbg_call(cb: *u8, data: libc::uintptr_t)
+                          -> libc::uintptr_t;
+    }
 }
 
 extern fn cb(data: libc::uintptr_t) -> libc::uintptr_t {

src/test/run-fail/extern-fail.rs

@@ -17,8 +17,10 @@
 
 extern mod std;
 
-extern mod rustrt {
-    pub fn rust_get_argc() -> libc::c_int;
+mod rustrt {
+    pub extern {
+        pub fn rust_get_argc() -> libc::c_int;
+    }
 }
 
 fn getbig_call_c_and_fail(i: int) {

src/test/run-fail/morestack2.rs

@@ -79,11 +79,13 @@ fn test_ptr() {
     }
 }
 
-#[abi = "cdecl"]
-#[nolink]
-extern mod test {
-    pub fn rust_get_sched_id() -> libc::intptr_t;
-    pub fn get_task_id() -> libc::intptr_t;
+mod test {
+    #[abi = "cdecl"]
+    #[nolink]
+    pub extern {
+        pub fn rust_get_sched_id() -> libc::intptr_t;
+        pub fn get_task_id() -> libc::intptr_t;
+    }
 }
 
 #[deriving_eq]