diff --git a/src/compiletest/compiletest.rs b/src/compiletest/compiletest.rs index 94153c169ac..15aa68aaebb 100644 --- a/src/compiletest/compiletest.rs +++ b/src/compiletest/compiletest.rs @@ -13,8 +13,8 @@ #[allow(non_camel_case_types)]; #[deny(warnings)]; -extern mod extra; -extern mod getopts; +extern crate extra; +extern crate getopts; use std::os; use std::io; diff --git a/src/doc/favicon.inc b/src/doc/favicon.inc index 8dd05620e48..b68c58c9b61 100644 --- a/src/doc/favicon.inc +++ b/src/doc/favicon.inc @@ -1 +1 @@ - \ No newline at end of file + diff --git a/src/doc/guide-runtime.md b/src/doc/guide-runtime.md index 40319c1ec4f..6d5d90e2617 100644 --- a/src/doc/guide-runtime.md +++ b/src/doc/guide-runtime.md @@ -232,7 +232,7 @@ fn main() {} Whereas this program explicitly opts into using a particular runtime ~~~{.rust} -extern mod green; +extern crate green; #[start] fn start(argc: int, argv: **u8) -> int { diff --git a/src/doc/guide-tasks.md b/src/doc/guide-tasks.md index 9ff712df021..813b61dc8fb 100644 --- a/src/doc/guide-tasks.md +++ b/src/doc/guide-tasks.md @@ -285,7 +285,7 @@ later. The basic example below illustrates this. ~~~ -# extern mod sync; +# extern crate sync; # fn main() { # fn make_a_sandwich() {}; @@ -310,7 +310,7 @@ Here is another example showing how futures allow you to background computations be distributed on the available cores. ~~~ -# extern mod sync; +# extern crate sync; # use std::vec; fn partial_sum(start: uint) -> f64 { let mut local_sum = 0f64; @@ -346,7 +346,7 @@ Here is a small example showing how to use Arcs. We wish to run concurrently sev a single large vector of floats. Each task needs the full vector to perform its duty. ~~~ -# extern mod sync; +# extern crate sync; # use std::vec; # use std::rand; use sync::Arc; @@ -379,7 +379,7 @@ at the power given as argument and takes the inverse power of this value). The A created by the line ~~~ -# extern mod sync; +# extern crate sync; # use sync::Arc; # use std::vec; # use std::rand; @@ -392,7 +392,7 @@ let numbers_arc=Arc::new(numbers); and a clone of it is sent to each task ~~~ -# extern mod sync; +# extern crate sync; # use sync::Arc; # use std::vec; # use std::rand; @@ -409,7 +409,7 @@ copying only the wrapper and not its contents. Each task recovers the underlying data by ~~~ -# extern mod sync; +# extern crate sync; # use sync::Arc; # use std::vec; # use std::rand; @@ -499,7 +499,7 @@ the string in response. The child terminates when it receives `0`. Here is the function that implements the child task: ~~~ -# extern mod sync; +# extern crate sync; # fn main() { # use sync::DuplexStream; fn stringifier(channel: &DuplexStream<~str, uint>) { @@ -524,7 +524,7 @@ response itself is simply the stringified version of the received value, Here is the code for the parent task: ~~~ -# extern mod sync; +# extern crate sync; # use std::task::spawn; # use sync::DuplexStream; # fn stringifier(channel: &DuplexStream<~str, uint>) { diff --git a/src/doc/guide-testing.md b/src/doc/guide-testing.md index 455c65cef8b..e51988565b0 100644 --- a/src/doc/guide-testing.md +++ b/src/doc/guide-testing.md @@ -185,7 +185,7 @@ amount. For example: ~~~ -extern mod extra; +extern crate extra; use std::vec; use extra::test::BenchHarness; @@ -243,7 +243,7 @@ recognize that some calculation has no external effects and remove it entirely. ~~~ -extern mod extra; +extern crate extra; use extra::test::BenchHarness; #[bench] diff --git a/src/doc/po/ja/complement-cheatsheet.md.po b/src/doc/po/ja/complement-cheatsheet.md.po index 77fdddf343d..72ef1d5a010 100644 --- a/src/doc/po/ja/complement-cheatsheet.md.po +++ b/src/doc/po/ja/complement-cheatsheet.md.po @@ -273,7 +273,7 @@ msgstr "## タプル" #. type: Plain text #: src/doc/complement-cheatsheet.md:122 #, fuzzy, no-wrap -#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" +#| msgid "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" msgid "" "~~~\n" "struct Foo {\n" @@ -282,7 +282,7 @@ msgid "" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" diff --git a/src/doc/po/ja/guide-conditions.md.po b/src/doc/po/ja/guide-conditions.md.po index 1ef53f940e8..a65d6eec419 100644 --- a/src/doc/po/ja/guide-conditions.md.po +++ b/src/doc/po/ja/guide-conditions.md.po @@ -79,13 +79,13 @@ msgstr "# 関数" #: src/doc/guide-conditions.md:262 #, fuzzy #| msgid "" -#| "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello " +#| "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello " #| "\" + world::explore()); } ~~~~" msgid "fn main() {" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" diff --git a/src/doc/po/ja/guide-container.md.po b/src/doc/po/ja/guide-container.md.po index 652338c5fd4..23e1c7734f0 100644 --- a/src/doc/po/ja/guide-container.md.po +++ b/src/doc/po/ja/guide-container.md.po @@ -74,7 +74,7 @@ msgstr "# イントロダクション" #. type: Plain text #: src/doc/guide-container.md:85 #, fuzzy, no-wrap -#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" +#| msgid "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" msgid "" "impl Iterator for ZeroStream {\n" " fn next(&mut self) -> Option {\n" @@ -85,7 +85,7 @@ msgid "" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" diff --git a/src/doc/po/ja/guide-ffi.md.po b/src/doc/po/ja/guide-ffi.md.po index e2f24daadce..3155b9f6505 100644 --- a/src/doc/po/ja/guide-ffi.md.po +++ b/src/doc/po/ja/guide-ffi.md.po @@ -70,7 +70,7 @@ msgstr "## 最小限の例" #. type: Plain text #: src/doc/guide-ffi.md:323 #, fuzzy, no-wrap -#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" +#| msgid "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" msgid "" "struct RustObject {\n" " a: i32,\n" @@ -79,7 +79,7 @@ msgid "" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" diff --git a/src/doc/po/ja/guide-pointers.md.po b/src/doc/po/ja/guide-pointers.md.po index 8cae9a31627..2b130821c4c 100644 --- a/src/doc/po/ja/guide-pointers.md.po +++ b/src/doc/po/ja/guide-pointers.md.po @@ -154,7 +154,7 @@ msgstr "" #: src/doc/guide-pointers.md:141 src/doc/guide-pointers.md:221 #: src/doc/guide-pointers.md:238 src/doc/guide-pointers.md:300 #, fuzzy, no-wrap -#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" +#| msgid "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" msgid "" "~~~rust\n" "struct Point {\n" @@ -164,7 +164,7 @@ msgid "" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" @@ -222,7 +222,7 @@ msgstr "# データ構造" #. type: Plain text #: src/doc/guide-pointers.md:189 #, fuzzy, no-wrap -#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" +#| msgid "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" msgid "" "~~~rust\n" "enum List {\n" @@ -232,7 +232,7 @@ msgid "" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" @@ -304,7 +304,7 @@ msgstr "## マネージドボックス" #. type: Plain text #: src/doc/guide-pointers.md:269 #, fuzzy, no-wrap -#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" +#| msgid "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" msgid "" "~~~rust{.ignore}\n" "struct Point {\n" @@ -314,7 +314,7 @@ msgid "" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" @@ -372,7 +372,7 @@ msgstr "" #. type: Plain text #: src/doc/guide-pointers.md:341 #, fuzzy, no-wrap -#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" +#| msgid "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" msgid "" "struct Point {\n" " x: f32,\n" @@ -381,7 +381,7 @@ msgid "" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" @@ -402,7 +402,7 @@ msgstr "" #. type: Plain text #: src/doc/guide-pointers.md:378 #, fuzzy, no-wrap -#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" +#| msgid "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" msgid "" "~~~rust{.ignore}\n" "fn main() {\n" @@ -413,7 +413,7 @@ msgid "" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" @@ -499,7 +499,7 @@ msgstr "" #. type: Plain text #: src/doc/guide-pointers.md:450 #, fuzzy, no-wrap -#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" +#| msgid "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" msgid "" "fn main() {\n" " let x = ~5;\n" @@ -509,7 +509,7 @@ msgid "" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" @@ -530,7 +530,7 @@ msgstr "" #. type: Plain text #: src/doc/guide-pointers.md:463 #, fuzzy, no-wrap -#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" +#| msgid "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" msgid "" "fn main() {\n" " let x = ~5;\n" @@ -540,14 +540,14 @@ msgid "" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" #. type: Plain text #: src/doc/guide-pointers.md:477 #, fuzzy, no-wrap -#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" +#| msgid "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" msgid "" "fn main() {\n" " let x = ~5;\n" @@ -557,7 +557,7 @@ msgid "" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" diff --git a/src/doc/po/ja/guide-runtime.md.po b/src/doc/po/ja/guide-runtime.md.po index 9c4259fa113..2e02fe344eb 100644 --- a/src/doc/po/ja/guide-runtime.md.po +++ b/src/doc/po/ja/guide-runtime.md.po @@ -83,13 +83,13 @@ msgstr "## 他のクレートの利用" #: src/doc/guide-runtime.md:231 #, fuzzy #| msgid "" -#| "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello " +#| "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello " #| "\" + world::explore()); } ~~~~" msgid "~~~{.rust} fn main() {} ~~~" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" @@ -97,7 +97,7 @@ msgstr "" #: src/doc/guide-runtime.md:236 #, fuzzy #| msgid "~~~~ {.ignore} let foo = 10;" -msgid "~~~{.rust} extern mod green;" +msgid "~~~{.rust} extern crate green;" msgstr "" "~~~~ {.ignore}\n" "let foo = 10;" @@ -106,13 +106,13 @@ msgstr "" #: src/doc/guide-runtime.md:246 #, fuzzy #| msgid "" -#| "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello " +#| "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello " #| "\" + world::explore()); } ~~~~" msgid "fn main() {} ~~~" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" diff --git a/src/doc/po/ja/guide-testing.md.po b/src/doc/po/ja/guide-testing.md.po index 4a173de1cbf..6ec1a4467da 100644 --- a/src/doc/po/ja/guide-testing.md.po +++ b/src/doc/po/ja/guide-testing.md.po @@ -61,7 +61,7 @@ msgstr "## 最小限の例" #: src/doc/guide-testing.md:131 #, fuzzy #| msgid "~~~~ use std::task::spawn;" -msgid "~~~ extern mod extra; use std::vec;" +msgid "~~~ extern crate extra; use std::vec;" msgstr "" "~~~~\n" "use std::task::spawn;" diff --git a/src/doc/po/ja/rust.md.po b/src/doc/po/ja/rust.md.po index a4b875062fb..0e96f4db84b 100644 --- a/src/doc/po/ja/rust.md.po +++ b/src/doc/po/ja/rust.md.po @@ -310,14 +310,14 @@ msgstr "## 他のクレートの利用" #: src/doc/rust.md:786 #, fuzzy #| msgid "## Using other crates" -msgid "Four examples of `extern mod` declarations:" +msgid "Four examples of `extern crate` declarations:" msgstr "## 他のクレートの利用" #. type: Plain text #: src/doc/rust.md:789 #, fuzzy #| msgid "~~~~ {.ignore} let foo = 10;" -msgid "~~~~ {.ignore} extern mod pcre;" +msgid "~~~~ {.ignore} extern crate pcre;" msgstr "" "~~~~ {.ignore}\n" "let foo = 10;" @@ -365,7 +365,7 @@ msgstr "## 最小限の例" #| msgid "~~~~ {.ignore} let foo = 10;" msgid "" "mod foo {\n" -" extern mod extra;\n" +" extern crate extra;\n" msgstr "" "~~~~ {.ignore}\n" "let foo = 10;" @@ -374,13 +374,13 @@ msgstr "" #: src/doc/rust.md:901 #, fuzzy #| msgid "" -#| "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello " +#| "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello " #| "\" + world::explore()); } ~~~~" msgid "fn main() {} ~~~~" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" @@ -751,7 +751,7 @@ msgstr "# イントロダクション" #. type: Plain text #: src/doc/rust.md:1420 #, fuzzy, no-wrap -#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" +#| msgid "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" msgid "" "struct Circle {\n" " radius: f64,\n" @@ -760,7 +760,7 @@ msgid "" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" @@ -775,13 +775,13 @@ msgstr "## 本書の表記について" #: src/doc/rust.md:1644 src/doc/rust.md:1665 #, fuzzy #| msgid "" -#| "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello " +#| "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello " #| "\" + world::explore()); } ~~~~" msgid "# fn main() {} ~~~~" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" @@ -866,7 +866,7 @@ msgstr "## 凍結" #. type: Plain text #: src/doc/rust.md:1953 #, fuzzy, no-wrap -#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" +#| msgid "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" msgid "" "~~~~\n" "#[deriving(Eq, Clone)]\n" @@ -878,7 +878,7 @@ msgid "" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" @@ -1254,7 +1254,7 @@ msgstr "" #. type: Plain text #: src/doc/rust.md:2702 #, fuzzy, no-wrap -#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" +#| msgid "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" msgid "" "while i < 10 {\n" " println!(\"hello\");\n" @@ -1264,7 +1264,7 @@ msgid "" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" @@ -1306,7 +1306,7 @@ msgstr "## 最小限の例" #. type: Plain text #: src/doc/rust.md:2774 #, fuzzy, no-wrap -#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" +#| msgid "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" msgid "" "for e in v.iter() {\n" " bar(*e);\n" @@ -1315,7 +1315,7 @@ msgid "" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" @@ -1637,7 +1637,7 @@ msgstr "## 最小限の例" #. type: Plain text #: src/doc/rust.md:3314 #, fuzzy, no-wrap -#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" +#| msgid "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" msgid "" "~~~~\n" "trait Printable {\n" @@ -1646,14 +1646,14 @@ msgid "" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" #. type: Plain text #: src/doc/rust.md:3318 #, fuzzy, no-wrap -#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" +#| msgid "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" msgid "" "impl Printable for int {\n" " fn to_string(&self) -> ~str { self.to_str() }\n" @@ -1661,14 +1661,14 @@ msgid "" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" #. type: Plain text #: src/doc/rust.md:3327 #, fuzzy, no-wrap -#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" +#| msgid "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" msgid "" "fn main() {\n" " print(@10 as @Printable);\n" @@ -1677,7 +1677,7 @@ msgid "" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" @@ -1698,7 +1698,7 @@ msgstr "# クロージャ" #. type: Plain text #: src/doc/rust.md:3359 #, fuzzy, no-wrap -#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" +#| msgid "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" msgid "" "~~~~\n" "trait Printable {\n" @@ -1707,14 +1707,14 @@ msgid "" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" #. type: Plain text #: src/doc/rust.md:3366 #, fuzzy, no-wrap -#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" +#| msgid "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" msgid "" "impl Printable for ~str {\n" " fn make_string(&self) -> ~str {\n" @@ -1725,7 +1725,7 @@ msgid "" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" diff --git a/src/doc/po/ja/tutorial.md.po b/src/doc/po/ja/tutorial.md.po index 9d36cb4d913..34769b320b7 100644 --- a/src/doc/po/ja/tutorial.md.po +++ b/src/doc/po/ja/tutorial.md.po @@ -431,7 +431,7 @@ msgstr "" #. type: Plain text #: src/doc/tutorial.md:136 #, fuzzy, no-wrap -#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" +#| msgid "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" msgid "" "~~~~\n" "fn main() {\n" @@ -441,7 +441,7 @@ msgid "" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" @@ -634,7 +634,7 @@ msgstr "" #. type: Plain text #: src/doc/tutorial.md:222 #, fuzzy, no-wrap -#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" +#| msgid "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" msgid "" "while count < 10 {\n" " println!(\"count is {}\", count);\n" @@ -644,7 +644,7 @@ msgid "" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" @@ -1413,7 +1413,7 @@ msgstr "" #. type: Plain text #: src/doc/tutorial.md:602 #, fuzzy, no-wrap -#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" +#| msgid "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" msgid "" "~~~~\n" "struct Point {\n" @@ -1424,7 +1424,7 @@ msgid "" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" @@ -2187,7 +2187,7 @@ msgstr "# ボックス" #. type: Plain text #: src/doc/tutorial.md:986 #, fuzzy, no-wrap -#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" +#| msgid "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" msgid "" "struct Foo {\n" " a: u32,\n" @@ -2198,7 +2198,7 @@ msgid "" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" @@ -2312,7 +2312,7 @@ msgstr "例として、シンプルな構造体型の `Point` について考え #. type: Plain text #: src/doc/tutorial.md:1376 #, fuzzy, no-wrap -#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" +#| msgid "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" msgid "" "~~~\n" "struct Point {\n" @@ -2323,7 +2323,7 @@ msgid "" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" @@ -3688,7 +3688,7 @@ msgstr "" #. type: Plain text #: src/doc/tutorial.md:2110 #, fuzzy, no-wrap -#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" +#| msgid "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" msgid "" "~~~\n" "struct TimeBomb {\n" @@ -3697,7 +3697,7 @@ msgid "" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" @@ -3735,7 +3735,7 @@ msgstr "" #. type: Plain text #: src/doc/tutorial.md:2135 #, fuzzy, no-wrap -#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" +#| msgid "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" msgid "" "~~~~\n" "trait Printable {\n" @@ -3745,7 +3745,7 @@ msgid "" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" @@ -3774,7 +3774,7 @@ msgstr "[impls]: #メソッド" #. type: Plain text #: src/doc/tutorial.md:2160 src/doc/tutorial.md:2206 #, fuzzy, no-wrap -#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" +#| msgid "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" msgid "" "impl Printable for ~str {\n" " fn print(&self) { println!(\"{}\", *self) }\n" @@ -3782,7 +3782,7 @@ msgid "" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" @@ -3821,7 +3821,7 @@ msgstr "## トレイトの実装の導出" #. type: Plain text #: src/doc/tutorial.md:2185 #, fuzzy, no-wrap -#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" +#| msgid "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" msgid "" "impl Printable for bool {\n" " fn print(&self) { println!(\"{:?}\", *self) }\n" @@ -3829,7 +3829,7 @@ msgid "" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" @@ -3864,7 +3864,7 @@ msgstr "## タプル" #. type: Plain text #: src/doc/tutorial.md:2235 #, fuzzy, no-wrap -#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" +#| msgid "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" msgid "" "~~~~\n" "trait Seq {\n" @@ -3873,14 +3873,14 @@ msgid "" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" #. type: Plain text #: src/doc/tutorial.md:2240 #, fuzzy, no-wrap -#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" +#| msgid "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" msgid "" "impl Seq for ~[T] {\n" " fn length(&self) -> uint { self.len() }\n" @@ -3889,7 +3889,7 @@ msgid "" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" @@ -4447,7 +4447,7 @@ msgstr "## クレート" #. type: Plain text #: src/doc/tutorial.md:2554 #, fuzzy, no-wrap -#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" +#| msgid "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" msgid "" "~~~~\n" "// `main.rs`\n" @@ -4458,7 +4458,7 @@ msgid "" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" @@ -4487,7 +4487,7 @@ msgstr "## 標準ライブラリ" #. type: Plain text #: src/doc/tutorial.md:2587 #, fuzzy, no-wrap -#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" +#| msgid "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" msgid "" "fn main() {\n" " println!(\"Hello farm!\");\n" @@ -4496,7 +4496,7 @@ msgid "" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" @@ -4510,21 +4510,21 @@ msgstr "## マネージドクロージャ" #. type: Plain text #: src/doc/tutorial.md:2607 #, fuzzy, no-wrap -#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" +#| msgid "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" msgid "" "fn main() {\n" " println!(\"Hello chicken!\");\n" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" #. type: Plain text #: src/doc/tutorial.md:2639 #, fuzzy, no-wrap -#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" +#| msgid "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" msgid "" "fn main() {\n" " println!(\"Hello chicken!\");\n" @@ -4534,7 +4534,7 @@ msgid "" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" @@ -4573,7 +4573,7 @@ msgstr "# モジュールとクレート" #. type: Plain text #: src/doc/tutorial.md:2719 #, fuzzy, no-wrap -#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" +#| msgid "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" msgid "" "fn main() {\n" " println!(\"Hello farm!\");\n" @@ -4583,7 +4583,7 @@ msgid "" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" @@ -4653,34 +4653,34 @@ msgstr "" #: src/doc/tutorial.md:2897 #, fuzzy #| msgid "" -#| "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello " +#| "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello " #| "\" + world::explore()); } ~~~~" msgid "fn main() { cow() } ~~~" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" #. type: Plain text #: src/doc/tutorial.md:2916 #, fuzzy, no-wrap -#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" +#| msgid "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" msgid "" "fn main() {\n" " println!(\"Hello farm!\");\n" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" #. type: Plain text #: src/doc/tutorial.md:2923 #, fuzzy, no-wrap -#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" +#| msgid "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" msgid "" " // Can now refer to those names directly:\n" " chicken();\n" @@ -4691,7 +4691,7 @@ msgid "" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" @@ -4699,7 +4699,7 @@ msgstr "" #: src/doc/tutorial.md:2932 #, fuzzy #| msgid "" -#| "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello " +#| "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello " #| "\" + world::explore()); } ~~~~" msgid "" "~~~{.ignore} // `a.rs` - crate root use b::foo; mod b; fn main() { foo(); } " @@ -4707,7 +4707,7 @@ msgid "" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" @@ -4715,21 +4715,21 @@ msgstr "" #: src/doc/tutorial.md:2939 #, fuzzy #| msgid "" -#| "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello " +#| "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello " #| "\" + world::explore()); } ~~~~" msgid "" "~~~{.ignore} // `b.rs` use b::c::bar; pub mod c; pub fn foo() { bar(); } ~~~" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" #. type: Plain text #: src/doc/tutorial.md:2985 #, fuzzy, no-wrap -#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" +#| msgid "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" msgid "" "fn main() {\n" " egg_layer();\n" @@ -4738,7 +4738,7 @@ msgid "" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" @@ -4752,7 +4752,7 @@ msgstr "# ポインタのデリファレンス" #. type: Plain text #: src/doc/tutorial.md:3014 #, fuzzy, no-wrap -#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" +#| msgid "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" msgid "" "fn main() {\n" " farm::chicken();\n" @@ -4763,7 +4763,7 @@ msgid "" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" @@ -4778,13 +4778,13 @@ msgstr "## 他のクレートの利用" #: src/doc/tutorial.md:3035 #, fuzzy #| msgid "## Using other crates" -msgid "For that, Rust offers you the `extern mod` declaration:" +msgid "For that, Rust offers you the `extern crate` declaration:" msgstr "## 他のクレートの利用" #. type: Plain text #: src/doc/tutorial.md:3045 #, fuzzy, no-wrap -#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" +#| msgid "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" msgid "" "fn main() {\n" " // The rational number '1/2':\n" @@ -4794,7 +4794,7 @@ msgid "" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" @@ -4802,7 +4802,7 @@ msgstr "" #: src/doc/tutorial.md:3068 #, fuzzy #| msgid "~~~~ {.ignore} let foo = 10;" -msgid "~~~ extern mod extra;" +msgid "~~~ extern crate extra;" msgstr "" "~~~~ {.ignore}\n" "let foo = 10;" @@ -4810,7 +4810,7 @@ msgstr "" #. type: Plain text #: src/doc/tutorial.md:3081 #, fuzzy, no-wrap -#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" +#| msgid "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" msgid "" "fn main() {\n" " farm::dog();\n" @@ -4820,7 +4820,7 @@ msgid "" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" @@ -4835,17 +4835,17 @@ msgstr "## 構造体" #: src/doc/tutorial.md:3123 #, fuzzy #| msgid "" -#| "~~~~ {.ignore} extern mod farm; extern mod my_farm (name = \"farm\", vers " -#| "= \"2.5\"); extern mod my_auxiliary_farm (name = \"farm\", author = \"mjh" +#| "~~~~ {.ignore} extern crate farm; extern crate my_farm (name = \"farm\", vers " +#| "= \"2.5\"); extern crate my_auxiliary_farm (name = \"farm\", author = \"mjh" #| "\"); ~~~~" msgid "" -"~~~~ {.ignore} extern mod farm; extern mod farm = \"farm#2.5\"; extern mod " +"~~~~ {.ignore} extern crate farm; extern crate farm = \"farm#2.5\"; extern crate " "my_farm = \"farm\"; ~~~~" msgstr "" "~~~~ {.ignore}\n" -"extern mod farm;\n" -"extern mod my_farm (name = \"farm\", vers = \"2.5\");\n" -"extern mod my_auxiliary_farm (name = \"farm\", author = \"mjh\");\n" +"extern crate farm;\n" +"extern crate my_farm (name = \"farm\", vers = \"2.5\");\n" +"extern crate my_auxiliary_farm (name = \"farm\", author = \"mjh\");\n" "~~~~" #. type: Plain text @@ -4891,7 +4891,7 @@ msgstr "" #| "~~~~ // world.rs #[link(name = \"world\", vers = \"1.0\")]; pub fn " #| "explore() -> &str { \"world\" } ~~~~" msgid "" -"~~~~ // `world.rs` #[crate_id = \"world#0.42\"]; # extern mod extra; pub fn " +"~~~~ // `world.rs` #[crate_id = \"world#0.42\"]; # extern crate extra; pub fn " "explore() -> &'static str { \"world\" } # fn main() {} ~~~~" msgstr "" "~~~~\n" @@ -4904,15 +4904,15 @@ msgstr "" #: src/doc/tutorial.md:3159 #, fuzzy #| msgid "" -#| "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello " +#| "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello " #| "\" + world::explore()); } ~~~~" msgid "" -"~~~~ {.ignore} // `main.rs` extern mod world; fn main() { println!(\"hello " +"~~~~ {.ignore} // `main.rs` extern crate world; fn main() { println!(\"hello " "{}\", world::explore()); } ~~~~" msgstr "" "~~~~ {.ignore}\n" "// main.rs\n" -"extern mod world;\n" +"extern crate world;\n" "fn main() { println(~\"hello \" + world::explore()); }\n" "~~~~" @@ -4977,7 +4977,7 @@ msgstr "## 標準ライブラリ" #: src/doc/tutorial.md:3187 #, fuzzy #| msgid "~~~~ {.ignore} let foo = 10;" -msgid "~~~ {.ignore} extern mod std; ~~~" +msgid "~~~ {.ignore} extern crate std; ~~~" msgstr "" "~~~~ {.ignore}\n" "let foo = 10;" diff --git a/src/doc/rust.md b/src/doc/rust.md index fe0fd8bd84d..c605ed06ffd 100644 --- a/src/doc/rust.md +++ b/src/doc/rust.md @@ -759,7 +759,7 @@ A view item manages the namespace of a module. View items do not define new items, but rather, simply change other items' visibility. There are several kinds of view item: - * [`extern mod` declarations](#extern-mod-declarations) + * [`extern crate` declarations](#extern-mod-declarations) * [`use` declarations](#use-declarations) ##### Extern mod declarations @@ -770,7 +770,7 @@ link_attrs : link_attr [ ',' link_attrs ] + ; link_attr : ident '=' literal ; ~~~~ -An _`extern mod` declaration_ specifies a dependency on an external crate. +An _`extern crate` declaration_ specifies a dependency on an external crate. The external crate is then bound into the declaring scope as the `ident` provided in the `extern_mod_decl`. @@ -782,16 +782,16 @@ against the `crateid` attributes that were declared on the external crate when it was compiled. If no `crateid` is provided, a default `name` attribute is assumed, equal to the `ident` given in the `extern_mod_decl`. -Four examples of `extern mod` declarations: +Four examples of `extern crate` declarations: ~~~~ {.ignore} -extern mod pcre; +extern crate pcre; -extern mod extra; // equivalent to: extern mod extra = "extra"; +extern crate extra; // equivalent to: extern crate extra = "extra"; -extern mod rustextra = "extra"; // linking to 'extra' under another name +extern crate rustextra = "extra"; // linking to 'extra' under another name -extern mod foo = "some/where/rust-foo#foo:1.0"; // a full package ID for external tools +extern crate foo = "some/where/rust-foo#foo:1.0"; // a full package ID for external tools ~~~~ ##### Use declarations @@ -813,7 +813,7 @@ module item. These declarations may appear at the top of [modules](#modules) and *Note*: Unlike in many languages, `use` declarations in Rust do *not* declare linkage dependency with external crates. -Rather, [`extern mod` declarations](#extern-mod-declarations) declare linkage dependencies. +Rather, [`extern crate` declarations](#extern-mod-declarations) declare linkage dependencies. Use declarations support a number of convenient shortcuts: @@ -869,7 +869,7 @@ This also means that top-level module declarations should be at the crate root i of the declared modules within `use` items is desired. It is also possible to use `self` and `super` at the beginning of a `use` item to refer to the current and direct parent modules respectively. All rules regarding accessing declared modules in `use` declarations applies to both module declarations -and `extern mod` declarations. +and `extern crate` declarations. An example of what will and will not work for `use` items: @@ -879,7 +879,7 @@ use foo::extra; // good: foo is at the root of the crate use foo::baz::foobaz; // good: foo is at the root of the crate mod foo { - extern mod extra; + extern crate extra; use foo::extra::time; // good: foo is at crate root // use extra::*; // bad: extra is not at the crate root diff --git a/src/doc/rustdoc.md b/src/doc/rustdoc.md index 72282030fb3..83d1275ab97 100644 --- a/src/doc/rustdoc.md +++ b/src/doc/rustdoc.md @@ -53,7 +53,7 @@ struct Whizbang; To generate the docs, run `rustdoc universe.rs`. By default, it generates a directory called `doc`, with the documentation for `universe` being in -`doc/universe/index.html`. If you are using other crates with `extern mod`, +`doc/universe/index.html`. If you are using other crates with `extern crate`, rustdoc will even link to them when you use their types, as long as their documentation has already been generated by a previous run of rustdoc, or the crate advertises that its documentation is hosted at a given URL. @@ -176,7 +176,7 @@ rustdoc --test lib.rs --test-args '--ignored' When testing a library, code examples will often show how functions are used, and this code often requires `use`-ing paths from the crate. To accomodate this, -rustdoc will implicitly add `extern mod ;` where `` is the name of +rustdoc will implicitly add `extern crate ;` where `` is the name of the crate being tested to the top of each code example. This means that rustdoc must be able to find a compiled version of the library crate being tested. Extra search paths may be added via the `-L` flag to `rustdoc`. diff --git a/src/doc/tutorial.md b/src/doc/tutorial.md index d620ed0b54f..bb8d0fee5ca 100644 --- a/src/doc/tutorial.md +++ b/src/doc/tutorial.md @@ -2581,7 +2581,7 @@ As you can see, your module hierarchy is now three modules deep: There is the cr function, and the module `farm`. The module `farm` also contains two functions and a third module `barn`, which contains a function `hay`. -(In case you already stumbled over `extern mod`: It isn't directly related to a bare `mod`, we'll get to it later. ) +(In case you already stumbled over `extern crate`: It isn't directly related to a bare `mod`, we'll get to it later. ) ## Paths and visibility @@ -3018,10 +3018,10 @@ as there really is no reason to start from scratch each time you start a new pro In Rust terminology, we need a way to refer to other crates. -For that, Rust offers you the `extern mod` declaration: +For that, Rust offers you the `extern crate` declaration: ~~~ -extern mod num; +extern crate num; // `num` ships with Rust (much like `extra`; more details further down). fn main() { @@ -3030,8 +3030,8 @@ fn main() { } ~~~ -Despite its name, `extern mod` is a distinct construct from regular `mod` declarations: -A statement of the form `extern mod foo;` will cause `rustc` to search for the crate `foo`, +Despite its name, `extern crate` is a distinct construct from regular `mod` declarations: +A statement of the form `extern crate foo;` will cause `rustc` to search for the crate `foo`, and if it finds a matching binary it lets you use it from inside your crate. The effect it has on your module hierarchy mirrors aspects of both `mod` and `use`: @@ -3039,19 +3039,19 @@ The effect it has on your module hierarchy mirrors aspects of both `mod` and `us - Like `mod`, it causes `rustc` to actually emit code: The linkage information the binary needs to use the library `foo`. -- But like `use`, all `extern mod` statements that refer to the same library are interchangeable, +- But like `use`, all `extern crate` statements that refer to the same library are interchangeable, as each one really just presents an alias to an external module (the crate root of the library you're linking against). Remember how `use`-statements have to go before local declarations because the latter shadows the former? -Well, `extern mod` statements also have their own rules in that regard: -Both `use` and local declarations can shadow them, so the rule is that `extern mod` has to go in front +Well, `extern crate` statements also have their own rules in that regard: +Both `use` and local declarations can shadow them, so the rule is that `extern crate` has to go in front of both `use` and local declarations. Which can result in something like this: ~~~ -extern mod num; +extern crate num; use farm::dog; use num::rational::Ratio; @@ -3071,7 +3071,7 @@ they model most closely what people expect to shadow. ## Package ids -If you use `extern mod`, per default `rustc` will look for libraries in the library search path (which you can +If you use `extern crate`, per default `rustc` will look for libraries in the library search path (which you can extend with the `-L` switch). ## Crate metadata and settings @@ -3098,14 +3098,14 @@ Therefore, if you plan to compile your crate as a library, you should annotate i # fn farm() {} ~~~~ -You can also specify package ID information in a `extern mod` statement. For -example, these `extern mod` statements would both accept and select the +You can also specify package ID information in a `extern crate` statement. For +example, these `extern crate` statements would both accept and select the crate define above: ~~~~ {.ignore} -extern mod farm; -extern mod farm = "farm#2.5"; -extern mod my_farm = "farm"; +extern crate farm; +extern crate farm = "farm#2.5"; +extern crate my_farm = "farm"; ~~~~ Other crate settings and metadata include things like enabling/disabling certain errors or warnings, @@ -3133,14 +3133,14 @@ We define two crates, and use one of them as a library in the other. ~~~~ // `world.rs` #[crate_id = "world#0.42"]; -# extern mod extra; +# extern crate extra; pub fn explore() -> &'static str { "world" } # fn main() {} ~~~~ ~~~~ {.ignore} // `main.rs` -extern mod world; +extern crate world; fn main() { println!("hello {}", world::explore()); } ~~~~ @@ -3169,7 +3169,7 @@ in the `std` library, which is a crate that ships with Rust. The only magical thing that happens is that `rustc` automatically inserts this line into your crate root: ~~~ {.ignore} -extern mod std; +extern crate std; ~~~ As well as this line into every module body: @@ -3221,7 +3221,7 @@ See the [API documentation][stddoc] for details. Rust ships with crates such as the [extra library], an accumulation of useful things, that are however not important enough to deserve a place in the standard -library. You can link to a library such as `extra` with an `extern mod extra;`. +library. You can link to a library such as `extra` with an `extern crate extra;`. [extra library]: extra/index.html diff --git a/src/doc/version_info.html.template b/src/doc/version_info.html.template index 858e5a35f87..06008d16f5d 100644 --- a/src/doc/version_info.html.template +++ b/src/doc/version_info.html.template @@ -3,4 +3,4 @@ Rust VERSION
SHORT_HASH - \ No newline at end of file + diff --git a/src/driver/driver.rs b/src/driver/driver.rs index 25095950e18..ca462fc7a39 100644 --- a/src/driver/driver.rs +++ b/src/driver/driver.rs @@ -9,9 +9,9 @@ // except according to those terms. #[cfg(rustdoc)] -extern mod this = "rustdoc"; +extern crate this = "rustdoc"; #[cfg(rustc)] -extern mod this = "rustc"; +extern crate this = "rustc"; fn main() { this::main() } diff --git a/src/etc/combine-tests.py b/src/etc/combine-tests.py index 2c6edaea284..c972392a4a0 100755 --- a/src/etc/combine-tests.py +++ b/src/etc/combine-tests.py @@ -71,8 +71,8 @@ d.write( """ // AUTO-GENERATED FILE: DO NOT EDIT #[feature(globs, managed_boxes)]; -extern mod extra; -extern mod run_pass_stage2; +extern crate extra; +extern crate run_pass_stage2; use run_pass_stage2::*; use std::io; use std::io::Writer; diff --git a/src/etc/emacs/rust-mode.el b/src/etc/emacs/rust-mode.el index 95732f2553c..4e1c74c31df 100644 --- a/src/etc/emacs/rust-mode.el +++ b/src/etc/emacs/rust-mode.el @@ -129,8 +129,7 @@ (defconst rust-mode-keywords '("as" "break" - "continue" - "crate" + "continue" "crate" "do" "else" "enum" "extern" "false" "fn" "for" @@ -368,7 +367,7 @@ With argument, do it that many times. Negative argument -N means move back to Nth preceding end of defun. Assume that this is called after beginning-of-defun. So point is -at the beginning of the defun body. +at the beginning of the defun body. This is written mainly to be used as `end-of-defun-function' for Rust." (interactive "p") diff --git a/src/etc/extract-tests.py b/src/etc/extract-tests.py index 13eadc79880..2900023ea2b 100644 --- a/src/etc/extract-tests.py +++ b/src/etc/extract-tests.py @@ -28,7 +28,7 @@ CODE_BLOCK_DELIM_REGEX = re.compile(r'~~~') COMMENT_REGEX = re.compile(r'^# ') COMPILER_DIRECTIVE_REGEX = re.compile(r'\#\[(.*)\];') ELLIPSES_REGEX = re.compile(r'\.\.\.') -EXTERN_MOD_REGEX = re.compile(r'\bextern mod extra\b') +EXTERN_CRATE_REGEX = re.compile(r'\bextern crate extra\b') MAIN_FUNCTION_REGEX = re.compile(r'\bfn main\b') TAGS_REGEX = re.compile(r'\.([\w-]*)') @@ -49,12 +49,12 @@ OUTPUT_BLOCK_HEADER = '\n'.join(( def add_extern_mod(block): if not has_extern_mod(block): - # add `extern mod extra;` after compiler directives + # add `extern crate extra;` after compiler directives directives = [] while len(block) and is_compiler_directive(block[0]): directives.append(block.popleft()) - block.appendleft("\nextern mod extra;\n\n") + block.appendleft("\nextern crate extra;\n\n") block.extendleft(reversed(directives)) return block @@ -112,8 +112,8 @@ def extract_code_fragments(dest_dir, lines): def has_extern_mod(block): - """Checks if a code block has the line `extern mod extra`.""" - find_extern_mod = lambda x: re.search(EXTERN_MOD_REGEX, x) + """Checks if a code block has the line `extern crate extra`.""" + find_extern_mod = lambda x: re.search(EXTERN_CRATE_REGEX, x) return any(imap(find_extern_mod, block)) diff --git a/src/etc/generate-deriving-span-tests.py b/src/etc/generate-deriving-span-tests.py index 7acaa761bb2..ecf58d55576 100755 --- a/src/etc/generate-deriving-span-tests.py +++ b/src/etc/generate-deriving-span-tests.py @@ -38,7 +38,7 @@ TEMPLATE = """// Copyright {year} The Rust Project Developers. See the COPYRIGHT // This file was auto-generated using 'src/etc/generate-keyword-span-tests.py' #[feature(struct_variant)]; -extern mod extra; +extern crate extra; {error_deriving} struct Error; diff --git a/src/libarena/lib.rs b/src/libarena/lib.rs index 6639e7b3ab7..d827e45eddb 100644 --- a/src/libarena/lib.rs +++ b/src/libarena/lib.rs @@ -22,9 +22,7 @@ #[allow(missing_doc)]; #[feature(managed_boxes)]; -extern mod collections; - -#[cfg(test)] extern mod extra; +extern crate collections; use collections::list::{List, Cons, Nil}; use collections::list; @@ -506,8 +504,9 @@ impl Drop for TypedArena { #[cfg(test)] mod test { + extern crate extra; use super::{Arena, TypedArena}; - use extra::test::BenchHarness; + use self::extra::test::BenchHarness; struct Point { x: int, diff --git a/src/libcollections/lib.rs b/src/libcollections/lib.rs index 417bf47803e..e97eeac4f66 100644 --- a/src/libcollections/lib.rs +++ b/src/libcollections/lib.rs @@ -19,9 +19,8 @@ #[feature(macro_rules, managed_boxes)]; -#[cfg(test)] extern mod extra; - -extern mod serialize; +extern crate serialize; +#[cfg(test)] extern crate extra; // benchmark tests need this pub use bitv::Bitv; pub use btree::BTree; @@ -43,4 +42,4 @@ pub mod lru_cache; pub mod priority_queue; pub mod ringbuf; pub mod smallintmap; -pub mod treemap; \ No newline at end of file +pub mod treemap; diff --git a/src/libextra/json.rs b/src/libextra/json.rs index 3938f1a8994..a0ca9eca1bd 100644 --- a/src/libextra/json.rs +++ b/src/libextra/json.rs @@ -59,7 +59,7 @@ the code for these traits: `#[deriving(Decodable, Encodable)]` To encode using Encodable : ```rust -extern mod serialize; +extern crate serialize; use extra::json; use std::io; use serialize::Encodable; @@ -98,7 +98,7 @@ A basic `ToJson` example using a TreeMap of attribute name / attribute value: ```rust -extern mod collections; +extern crate collections; use extra::json; use extra::json::ToJson; @@ -128,7 +128,7 @@ fn main() { To decode a json string using `Decodable` trait : ```rust -extern mod serialize; +extern crate serialize; use serialize::Decodable; #[deriving(Decodable)] @@ -154,7 +154,7 @@ Create a struct called TestStruct1 and serialize and deserialize it to and from using the serialization API, using the derived serialization code. ```rust -extern mod serialize; +extern crate serialize; use extra::json; use serialize::{Encodable, Decodable}; @@ -186,8 +186,8 @@ This example use the ToJson impl to unserialize the json string. Example of `ToJson` trait implementation for TestStruct1. ```rust -extern mod serialize; -extern mod collections; +extern crate serialize; +extern crate collections; use extra::json; use extra::json::ToJson; diff --git a/src/libextra/lib.rs b/src/libextra/lib.rs index c630ac096f6..be7aa216e30 100644 --- a/src/libextra/lib.rs +++ b/src/libextra/lib.rs @@ -34,10 +34,10 @@ Rust extras are part of the standard Rust distribution. #[deny(non_camel_case_types)]; #[deny(missing_doc)]; -extern mod sync; -extern mod serialize; +extern crate sync; +extern crate serialize; -extern mod collections; +extern crate collections; // Utility modules diff --git a/src/libextra/test.rs b/src/libextra/test.rs index df13538b4bc..07327227d85 100644 --- a/src/libextra/test.rs +++ b/src/libextra/test.rs @@ -15,8 +15,8 @@ // simplest interface possible for representing and running tests // while providing a base that other test frameworks may build off of. -extern mod getopts; -extern mod term; +extern crate getopts; +extern crate term; use json::ToJson; use json; diff --git a/src/libfourcc/lib.rs b/src/libfourcc/lib.rs index e0353cb1fb6..270416305dd 100644 --- a/src/libfourcc/lib.rs +++ b/src/libfourcc/lib.rs @@ -23,7 +23,7 @@ To load the extension and use it: ```rust,ignore #[phase(syntax)] -extern mod fourcc; +extern crate fourcc; fn main() { let val = fourcc!("\xC0\xFF\xEE!"); @@ -46,7 +46,7 @@ fn main() { #[feature(macro_registrar, managed_boxes)]; -extern mod syntax; +extern crate syntax; use syntax::ast; use syntax::ast::Name; diff --git a/src/libgetopts/lib.rs b/src/libgetopts/lib.rs index 34e09ac1913..537c2d40c66 100644 --- a/src/libgetopts/lib.rs +++ b/src/libgetopts/lib.rs @@ -30,7 +30,7 @@ //! file name following `-o`, and accepts both `-h` and `--help` as optional flags. //! //! ~~~{.rust} -//! extern mod getopts; +//! extern crate getopts; //! use getopts::{optopt,optflag,getopts,OptGroup}; //! use std::os; //! diff --git a/src/libgreen/lib.rs b/src/libgreen/lib.rs index 834bf7951ef..8758eb1179e 100644 --- a/src/libgreen/lib.rs +++ b/src/libgreen/lib.rs @@ -113,7 +113,7 @@ //! # Starting with libgreen //! //! ```rust -//! extern mod green; +//! extern crate green; //! //! #[start] //! fn start(argc: int, argv: **u8) -> int { green::start(argc, argv, main) } diff --git a/src/libnative/lib.rs b/src/libnative/lib.rs index 4840c561289..c28a1175494 100644 --- a/src/libnative/lib.rs +++ b/src/libnative/lib.rs @@ -17,7 +17,7 @@ //! # Starting with libnative //! //! ```rust -//! extern mod native; +//! extern crate native; //! //! #[start] //! fn start(argc: int, argv: **u8) -> int { native::start(argc, argv, main) } @@ -30,7 +30,7 @@ //! # Force spawning a native task //! //! ```rust -//! extern mod native; +//! extern crate native; //! //! fn main() { //! // We're not sure whether this main function is run in 1:1 or M:N mode. diff --git a/src/libnum/lib.rs b/src/libnum/lib.rs index 5a5e717363a..8d5338451bd 100644 --- a/src/libnum/lib.rs +++ b/src/libnum/lib.rs @@ -15,7 +15,7 @@ #[crate_type = "dylib"]; #[license = "MIT/ASL2"]; -extern mod extra; +extern crate extra; pub mod bigint; pub mod rational; diff --git a/src/librustc/front/test.rs b/src/librustc/front/test.rs index 819f96a391b..be9fcf4a1e9 100644 --- a/src/librustc/front/test.rs +++ b/src/librustc/front/test.rs @@ -275,7 +275,7 @@ We're going to be building a module that looks more or less like: mod __test { #[!resolve_unexported] - extern mod extra (name = "extra", vers = "..."); + extern crate extra (name = "extra", vers = "..."); fn main() { #[main]; extra::test::test_main_static(::os::args(), tests) diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs index 05087581fd7..0d615fe1992 100644 --- a/src/librustc/lib.rs +++ b/src/librustc/lib.rs @@ -31,14 +31,14 @@ This API is completely unstable and subject to change. #[allow(unknown_features)]; // Note: remove it after a snapshot. #[feature(quote)]; -extern mod extra; -extern mod flate; -extern mod arena; -extern mod syntax; -extern mod serialize; -extern mod sync; -extern mod getopts; -extern mod collections; +extern crate extra; +extern crate flate; +extern crate arena; +extern crate syntax; +extern crate serialize; +extern crate sync; +extern crate getopts; +extern crate collections; use back::link; use driver::session; diff --git a/src/librustc/metadata/creader.rs b/src/librustc/metadata/creader.rs index a80ac38e8ae..901e8982c83 100644 --- a/src/librustc/metadata/creader.rs +++ b/src/librustc/metadata/creader.rs @@ -169,7 +169,7 @@ fn extract_crate_info(i: &ast::ViewItem) -> Option { match i.node { ast::ViewItemExternMod(ident, ref path_opt, id) => { let ident = token::get_ident(ident); - debug!("resolving extern mod stmt. ident: {:?} path_opt: {:?}", + debug!("resolving extern crate stmt. ident: {:?} path_opt: {:?}", ident, path_opt); let (name, version) = match *path_opt { Some((ref path_str, _)) => { diff --git a/src/librustc/metadata/cstore.rs b/src/librustc/metadata/cstore.rs index 33625000e4a..4febde6d443 100644 --- a/src/librustc/metadata/cstore.rs +++ b/src/librustc/metadata/cstore.rs @@ -69,7 +69,7 @@ pub struct CStore { intr: @IdentInterner } -// Map from NodeId's of local extern mod statements to crate numbers +// Map from NodeId's of local extern crate statements to crate numbers type extern_mod_crate_map = HashMap; impl CStore { diff --git a/src/librustc/middle/resolve.rs b/src/librustc/middle/resolve.rs index cb9e772dcea..1d28c781ea0 100644 --- a/src/librustc/middle/resolve.rs +++ b/src/librustc/middle/resolve.rs @@ -418,7 +418,7 @@ struct Module { imports: RefCell<~[@ImportDirective]>, // The external module children of this node that were declared with - // `extern mod`. + // `extern crate`. external_module_children: RefCell>, // The anonymous children of this node. Anonymous children are pseudo- @@ -2679,7 +2679,7 @@ impl Resolver { }; self.resolve_error(span, format!("unresolved import. maybe \ - a missing `extern mod \ + a missing `extern crate \ {}`?", segment_name)); return Failed; diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs index 10b22877936..c7c4aae35e3 100644 --- a/src/librustdoc/html/render.rs +++ b/src/librustdoc/html/render.rs @@ -1021,7 +1021,7 @@ fn item_module(w: &mut Writer, cx: &Context, clean::ViewItemItem(ref item) => { match item.inner { clean::ExternMod(ref name, ref src, _) => { - if_ok!(write!(w, "extern mod {}", + if_ok!(write!(w, "extern crate {}", name.as_slice())); match *src { Some(ref src) => if_ok!(write!(w, " = \"{}\"", diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs index f30e6309f38..e9072fb37bb 100644 --- a/src/librustdoc/lib.rs +++ b/src/librustdoc/lib.rs @@ -15,13 +15,13 @@ #[feature(globs, struct_variant, managed_boxes)]; -extern mod syntax; -extern mod rustc; -extern mod extra; -extern mod serialize; -extern mod sync; -extern mod getopts; -extern mod collections; +extern crate syntax; +extern crate rustc; +extern crate extra; +extern crate serialize; +extern crate sync; +extern crate getopts; +extern crate collections; use std::local_data; use std::io; diff --git a/src/librustdoc/test.rs b/src/librustdoc/test.rs index 9f8261b4449..4b32cdb77ea 100644 --- a/src/librustdoc/test.rs +++ b/src/librustdoc/test.rs @@ -144,10 +144,10 @@ fn maketest(s: &str, cratename: &str) -> ~str { #[allow(unused_variable, dead_assignment, unused_mut, attribute_usage, dead_code)]; "; if s.contains("extra") { - prog.push_str("extern mod extra;\n"); + prog.push_str("extern crate extra;\n"); } if s.contains(cratename) { - prog.push_str(format!("extern mod {};\n", cratename)); + prog.push_str(format!("extern crate {};\n", cratename)); } if s.contains("fn main") { prog.push_str(s); diff --git a/src/librustuv/lib.rs b/src/librustuv/lib.rs index 8c263c5e5f7..e44f65296f5 100644 --- a/src/librustuv/lib.rs +++ b/src/librustuv/lib.rs @@ -42,7 +42,7 @@ via `close` and `delete` methods. #[feature(macro_rules)]; #[deny(unused_result, unused_must_use)]; -#[cfg(test)] extern mod green; +#[cfg(test)] extern crate green; use std::cast; use std::io; diff --git a/src/libserialize/base64.rs b/src/libserialize/base64.rs index c22eefdb330..918c5e85857 100644 --- a/src/libserialize/base64.rs +++ b/src/libserialize/base64.rs @@ -63,7 +63,7 @@ impl<'a> ToBase64 for &'a [u8] { * # Example * * ```rust - * extern mod serialize; + * extern crate serialize; * use serialize::base64::{ToBase64, STANDARD}; * * fn main () { @@ -189,7 +189,7 @@ impl<'a> FromBase64 for &'a str { * This converts a string literal to base64 and back. * * ```rust - * extern mod serialize; + * extern crate serialize; * use serialize::base64::{ToBase64, FromBase64, STANDARD}; * use std::str; * diff --git a/src/libserialize/hex.rs b/src/libserialize/hex.rs index 409bf4af809..08a3dda854e 100644 --- a/src/libserialize/hex.rs +++ b/src/libserialize/hex.rs @@ -28,7 +28,7 @@ impl<'a> ToHex for &'a [u8] { * # Example * * ```rust - * extern mod serialize; + * extern crate serialize; * use serialize::hex::ToHex; * * fn main () { @@ -89,7 +89,7 @@ impl<'a> FromHex for &'a str { * This converts a string literal to hexadecimal and back. * * ```rust - * extern mod serialize; + * extern crate serialize; * use serialize::hex::{FromHex, ToHex}; * use std::str; * diff --git a/src/libserialize/lib.rs b/src/libserialize/lib.rs index 3b71b2237b1..7a4b1cff6e4 100644 --- a/src/libserialize/lib.rs +++ b/src/libserialize/lib.rs @@ -24,7 +24,7 @@ Core encoding and decoding interfaces. // test harness access #[cfg(test)] -extern mod extra; +extern crate extra; pub use self::serialize::{Decoder, Encoder, Decodable, Encodable, DecoderHelpers, EncoderHelpers}; diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index e0666ef4179..4452482b7e8 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -30,7 +30,7 @@ //! `std` is imported at the topmost level of every crate by default, as //! if the first line of each crate was //! -//! extern mod std; +//! extern crate std; //! //! This means that the contents of std can be accessed from any context //! with the `std::` path prefix, as in `use std::vec`, `use std::task::spawn`, @@ -64,15 +64,15 @@ // When testing libstd, bring in libuv as the I/O backend so tests can print // things and all of the std::io tests have an I/O interface to run on top // of -#[cfg(test)] extern mod rustuv = "rustuv"; -#[cfg(test)] extern mod native = "native"; -#[cfg(test)] extern mod green = "green"; +#[cfg(test)] extern crate rustuv = "rustuv"; +#[cfg(test)] extern crate native = "native"; +#[cfg(test)] extern crate green = "green"; // Make extra accessible for benchmarking -#[cfg(test)] extern mod extra = "extra"; +#[cfg(test)] extern crate extra = "extra"; // Make std testable by not duplicating lang items. See #2912 -#[cfg(test)] extern mod realstd = "std"; +#[cfg(test)] extern crate realstd = "std"; #[cfg(test)] pub use kinds = realstd::kinds; #[cfg(test)] pub use ops = realstd::ops; #[cfg(test)] pub use cmp = realstd::cmp; diff --git a/src/libsync/sync/mutex.rs b/src/libsync/sync/mutex.rs index 3726528a5e9..8489773bd88 100644 --- a/src/libsync/sync/mutex.rs +++ b/src/libsync/sync/mutex.rs @@ -495,7 +495,7 @@ impl Drop for Mutex { #[cfg(test)] mod test { - extern mod native; + extern crate native; use super::{Mutex, StaticMutex, MUTEX_INIT}; #[test] diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index 132cb396ddd..a3025d394da 100644 --- a/src/libsyntax/ast.rs +++ b/src/libsyntax/ast.rs @@ -1058,7 +1058,7 @@ pub enum ViewItem_ { // ident: name used to refer to this crate in the code // optional (InternedString,StrStyle): if present, this is a location // (containing arbitrary characters) from which to fetch the crate sources - // For example, extern mod whatever = "github.com/mozilla/rust" + // For example, extern crate whatever = "github.com/mozilla/rust" ViewItemExternMod(Ident, Option<(InternedString,StrStyle)>, NodeId), ViewItemUse(~[@ViewPath]), } diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs index 78e40a795db..3cbdad9a71d 100644 --- a/src/libsyntax/lib.rs +++ b/src/libsyntax/lib.rs @@ -32,10 +32,10 @@ This API is completely unstable and subject to change. #[deny(non_camel_case_types)]; -#[cfg(test)] extern mod extra; -extern mod serialize; -extern mod term; -extern mod collections; +#[cfg(test)] extern crate extra; +extern crate serialize; +extern crate term; +extern crate collections; pub mod util { pub mod interner; diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index f602925140b..6cde22fad10 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -4528,7 +4528,7 @@ impl Parser { // parse one of the items or view items allowed by the // flags; on failure, return IoviNone. // NB: this function no longer parses the items inside an - // extern mod. + // extern crate. fn parse_item_or_view_item(&mut self, attrs: ~[Attribute], macros_allowed: bool) @@ -4567,10 +4567,10 @@ impl Parser { if next_is_mod || self.eat_keyword(keywords::Crate) { if next_is_mod { - self.span_err(self.span, - format!("`extern mod` is obsolete, use \ - `extern crate` instead \ - to refer to external crates.")) + self.span_err(mk_sp(lo, self.last_span.hi), + format!("`extern mod` is obsolete, use \ + `extern crate` instead \ + to refer to external crates.")) } return self.parse_item_extern_crate(lo, visibility, attrs); } @@ -4970,7 +4970,7 @@ impl Parser { let mut items = ~[]; // I think this code would probably read better as a single - // loop with a mutable three-state-variable (for extern mods, + // loop with a mutable three-state-variable (for extern crates, // view items, and regular items) ... except that because // of macros, I'd like to delay that entire check until later. loop { @@ -4986,12 +4986,12 @@ impl Parser { IoviViewItem(view_item) => { match view_item.node { ViewItemUse(..) => { - // `extern mod` must precede `use`. + // `extern crate` must precede `use`. extern_mod_allowed = false; } ViewItemExternMod(..) if !extern_mod_allowed => { self.span_err(view_item.span, - "\"extern mod\" declarations are not allowed here"); + "\"extern crate\" declarations are not allowed here"); } ViewItemExternMod(..) => {} } @@ -5019,7 +5019,7 @@ impl Parser { IoviViewItem(view_item) => { attrs = self.parse_outer_attributes(); self.span_err(view_item.span, - "`use` and `extern mod` declarations must precede items"); + "`use` and `extern crate` declarations must precede items"); } IoviItem(item) => { attrs = self.parse_outer_attributes(); @@ -5059,7 +5059,7 @@ impl Parser { IoviViewItem(view_item) => { // I think this can't occur: self.span_err(view_item.span, - "`use` and `extern mod` declarations must precede items"); + "`use` and `extern crate` declarations must precede items"); } IoviItem(item) => { // FIXME #5668: this will occur for a macro invocation: diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs index bb2f345ac28..ceaa7d1a9a1 100644 --- a/src/libsyntax/print/pprust.rs +++ b/src/libsyntax/print/pprust.rs @@ -2061,7 +2061,7 @@ pub fn print_view_item(s: &mut State, item: &ast::ViewItem) -> io::IoResult<()> if_ok!(print_visibility(s, item.vis)); match item.node { ast::ViewItemExternMod(id, ref optional_path, _) => { - if_ok!(head(s, "extern mod")); + if_ok!(head(s, "extern crate")); if_ok!(print_ident(s, id)); for &(ref p, style) in optional_path.iter() { if_ok!(space(&mut s.s)); diff --git a/src/libuuid/lib.rs b/src/libuuid/lib.rs index 36b267c7eb7..180838d4132 100644 --- a/src/libuuid/lib.rs +++ b/src/libuuid/lib.rs @@ -61,8 +61,8 @@ Examples of string representations: // test harness access #[cfg(test)] -extern mod extra; -extern mod serialize; +extern crate extra; +extern crate serialize; use std::str; use std::vec; diff --git a/src/snapshots.txt b/src/snapshots.txt index 88966a61835..f3011aaea10 100644 --- a/src/snapshots.txt +++ b/src/snapshots.txt @@ -2,8 +2,8 @@ S 2014-02-14 18477ac freebsd-x86_64 102df7dfab2a1c59d9e2f16a3f02f368310dd022 linux-i386 fcf5891e9b3c7c9ef5ee5ea37e62089346099425 linux-x86_64 d7c2df185fd2e25b4b8f5b2caad277b5ba664b81 - macos-i386 - macos-x86_64 + macos-i386 c15faa408339ceebbb68e952e9bf7f2624ceb9e0 + macos-x86_64 445c6759db5e69250b8a8631ea7751d1474e4250 winnt-i386 f78a892f47627f34233e44c2ff4a00b68063a2ce S 2014-02-12 c62f6ce diff --git a/src/test/auxiliary/crateresolve4b-1.rs b/src/test/auxiliary/crateresolve4b-1.rs index c80fb8ee9e9..aa263f34841 100644 --- a/src/test/auxiliary/crateresolve4b-1.rs +++ b/src/test/auxiliary/crateresolve4b-1.rs @@ -13,6 +13,6 @@ #[crate_id="crateresolve4b#0.1"]; #[crate_type = "lib"]; -extern mod crateresolve4a = "crateresolve4a#0.2"; +extern crate crateresolve4a = "crateresolve4a#0.2"; pub fn f() -> int { crateresolve4a::g() } diff --git a/src/test/auxiliary/crateresolve4b-2.rs b/src/test/auxiliary/crateresolve4b-2.rs index 019b6047e63..e72a6cb163f 100644 --- a/src/test/auxiliary/crateresolve4b-2.rs +++ b/src/test/auxiliary/crateresolve4b-2.rs @@ -13,6 +13,6 @@ #[crate_id="crateresolve4b#0.2"]; #[crate_type = "lib"]; -extern mod crateresolve4a = "crateresolve4a#0.1"; +extern crate crateresolve4a = "crateresolve4a#0.1"; pub fn g() -> int { crateresolve4a::f() } diff --git a/src/test/auxiliary/crateresolve7x.rs b/src/test/auxiliary/crateresolve7x.rs index 6b85d28b288..5cf5c6d178d 100644 --- a/src/test/auxiliary/crateresolve7x.rs +++ b/src/test/auxiliary/crateresolve7x.rs @@ -14,11 +14,11 @@ // These both have the same version but differ in other metadata pub mod a { - extern mod cr_1 (name = "crateresolve_calories", vers = "0.1", calories="100"); + extern crate cr_1 (name = "crateresolve_calories", vers = "0.1", calories="100"); pub fn f() -> int { cr_1::f() } } pub mod b { - extern mod cr_2 (name = "crateresolve_calories", vers = "0.1", calories="200"); + extern crate cr_2 (name = "crateresolve_calories", vers = "0.1", calories="200"); pub fn f() -> int { cr_2::f() } } diff --git a/src/test/auxiliary/issue-2414-b.rs b/src/test/auxiliary/issue-2414-b.rs index 054e0bf7c32..177b735ead7 100644 --- a/src/test/auxiliary/issue-2414-b.rs +++ b/src/test/auxiliary/issue-2414-b.rs @@ -13,4 +13,4 @@ #[crate_id="b#0.1"]; #[crate_type = "lib"]; -extern mod a; +extern crate a; diff --git a/src/test/auxiliary/issue-2526.rs b/src/test/auxiliary/issue-2526.rs index e932a9c29ea..701c9f643ff 100644 --- a/src/test/auxiliary/issue-2526.rs +++ b/src/test/auxiliary/issue-2526.rs @@ -11,7 +11,7 @@ #[crate_id="issue_2526#0.2"]; #[crate_type = "lib"]; -extern mod extra; +extern crate extra; struct arc_destruct { _data: int, diff --git a/src/test/auxiliary/issue-2631-a.rs b/src/test/auxiliary/issue-2631-a.rs index 15dde899ce3..5c5a80e5d00 100644 --- a/src/test/auxiliary/issue-2631-a.rs +++ b/src/test/auxiliary/issue-2631-a.rs @@ -12,7 +12,7 @@ #[crate_id="req"]; #[crate_type = "lib"]; -extern mod extra; +extern crate extra; use std::cell::RefCell; use std::hashmap::HashMap; diff --git a/src/test/auxiliary/issue-9906.rs b/src/test/auxiliary/issue-9906.rs index 7d80c5b937e..d1a6755c1e9 100644 --- a/src/test/auxiliary/issue-9906.rs +++ b/src/test/auxiliary/issue-9906.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-fast windows doesn't like extern mod +// ignore-fast windows doesn't like extern crate // aux-build:issue-9906.rs pub use other::FooBar; diff --git a/src/test/auxiliary/issue2378b.rs b/src/test/auxiliary/issue2378b.rs index 2931245bb12..1ec6ab90696 100644 --- a/src/test/auxiliary/issue2378b.rs +++ b/src/test/auxiliary/issue2378b.rs @@ -10,7 +10,7 @@ #[crate_type = "lib"]; -extern mod issue2378a; +extern crate issue2378a; use issue2378a::maybe; diff --git a/src/test/auxiliary/issue_2242_c.rs b/src/test/auxiliary/issue_2242_c.rs index 4008402441b..077f3950217 100644 --- a/src/test/auxiliary/issue_2242_c.rs +++ b/src/test/auxiliary/issue_2242_c.rs @@ -11,7 +11,7 @@ #[crate_id="c#0.1"]; #[crate_type = "lib"]; -extern mod a; +extern crate a; use a::to_strz; diff --git a/src/test/auxiliary/issue_2316_b.rs b/src/test/auxiliary/issue_2316_b.rs index 92c20e8d9e3..36af01fe6c6 100644 --- a/src/test/auxiliary/issue_2316_b.rs +++ b/src/test/auxiliary/issue_2316_b.rs @@ -11,7 +11,7 @@ #[allow(unused_imports)]; #[feature(globs)]; -extern mod issue_2316_a; +extern crate issue_2316_a; pub mod cloth { use issue_2316_a::*; diff --git a/src/test/auxiliary/macro_crate_outlive_expansion_phase.rs b/src/test/auxiliary/macro_crate_outlive_expansion_phase.rs index eecbb325630..1a0fb8fe629 100644 --- a/src/test/auxiliary/macro_crate_outlive_expansion_phase.rs +++ b/src/test/auxiliary/macro_crate_outlive_expansion_phase.rs @@ -12,7 +12,7 @@ #[feature(macro_registrar)]; -extern mod syntax; +extern crate syntax; use std::any::Any; use std::local_data; diff --git a/src/test/auxiliary/macro_crate_test.rs b/src/test/auxiliary/macro_crate_test.rs index 2867e0f8143..b8baffcfea5 100644 --- a/src/test/auxiliary/macro_crate_test.rs +++ b/src/test/auxiliary/macro_crate_test.rs @@ -12,7 +12,7 @@ #[feature(globs, macro_registrar, macro_rules, quote)]; -extern mod syntax; +extern crate syntax; use syntax::ast::{Name, TokenTree}; use syntax::codemap::Span; diff --git a/src/test/auxiliary/pub_use_xcrate2.rs b/src/test/auxiliary/pub_use_xcrate2.rs index ce839daa3a0..d59d7f2a613 100644 --- a/src/test/auxiliary/pub_use_xcrate2.rs +++ b/src/test/auxiliary/pub_use_xcrate2.rs @@ -8,6 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod pub_use_xcrate1; +extern crate pub_use_xcrate1; pub use pub_use_xcrate1::Foo; diff --git a/src/test/auxiliary/trait_default_method_xc_aux_2.rs b/src/test/auxiliary/trait_default_method_xc_aux_2.rs index 145f84e558f..6a8c03ec6ad 100644 --- a/src/test/auxiliary/trait_default_method_xc_aux_2.rs +++ b/src/test/auxiliary/trait_default_method_xc_aux_2.rs @@ -10,7 +10,7 @@ // aux-build:trait_default_method_xc_aux.rs -extern mod aux = "trait_default_method_xc_aux"; +extern crate aux = "trait_default_method_xc_aux"; use aux::A; pub struct a_struct { x: int } diff --git a/src/test/bench/core-map.rs b/src/test/bench/core-map.rs index ed3874b1a6f..61b3ccd1f54 100644 --- a/src/test/bench/core-map.rs +++ b/src/test/bench/core-map.rs @@ -8,8 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod extra; -extern mod collections; +extern crate extra; +extern crate collections; use extra::time; use collections::TreeMap; diff --git a/src/test/bench/core-set.rs b/src/test/bench/core-set.rs index 2d63a6a241e..41c48d92692 100644 --- a/src/test/bench/core-set.rs +++ b/src/test/bench/core-set.rs @@ -10,8 +10,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod extra; -extern mod collections; +extern crate extra; +extern crate collections; use collections::bitv::BitvSet; use collections::TreeSet; diff --git a/src/test/bench/core-std.rs b/src/test/bench/core-std.rs index 743472af5ce..9c29b691173 100644 --- a/src/test/bench/core-std.rs +++ b/src/test/bench/core-std.rs @@ -12,7 +12,7 @@ #[feature(macro_rules)]; -extern mod extra; +extern crate extra; use extra::time::precise_time_s; use std::mem::swap; diff --git a/src/test/bench/msgsend-pipes-shared.rs b/src/test/bench/msgsend-pipes-shared.rs index b766be88d23..ae1ae0a4367 100644 --- a/src/test/bench/msgsend-pipes-shared.rs +++ b/src/test/bench/msgsend-pipes-shared.rs @@ -18,7 +18,7 @@ // different scalability characteristics compared to the select // version. -extern mod extra; +extern crate extra; use std::comm; use std::os; diff --git a/src/test/bench/msgsend-pipes.rs b/src/test/bench/msgsend-pipes.rs index 89e0bcf3326..ca06e96f0c0 100644 --- a/src/test/bench/msgsend-pipes.rs +++ b/src/test/bench/msgsend-pipes.rs @@ -14,7 +14,7 @@ // // I *think* it's the same, more or less. -extern mod extra; +extern crate extra; use std::os; use std::task; diff --git a/src/test/bench/msgsend-ring-mutex-arcs.rs b/src/test/bench/msgsend-ring-mutex-arcs.rs index 4b505ec8117..5dcccf8d861 100644 --- a/src/test/bench/msgsend-ring-mutex-arcs.rs +++ b/src/test/bench/msgsend-ring-mutex-arcs.rs @@ -15,8 +15,8 @@ // This also serves as a pipes test, because Arcs are implemented with pipes. -extern mod extra; -extern mod sync; +extern crate extra; +extern crate sync; use sync::Arc; use sync::MutexArc; diff --git a/src/test/bench/msgsend-ring-rw-arcs.rs b/src/test/bench/msgsend-ring-rw-arcs.rs index 23b4f00b280..3d619f2e313 100644 --- a/src/test/bench/msgsend-ring-rw-arcs.rs +++ b/src/test/bench/msgsend-ring-rw-arcs.rs @@ -15,8 +15,8 @@ // This also serves as a pipes test, because Arcs are implemented with pipes. -extern mod extra; -extern mod sync; +extern crate extra; +extern crate sync; use sync::RWArc; use sync::Future; diff --git a/src/test/bench/rt-messaging-ping-pong.rs b/src/test/bench/rt-messaging-ping-pong.rs index b42644f39cb..0cecb5d7527 100644 --- a/src/test/bench/rt-messaging-ping-pong.rs +++ b/src/test/bench/rt-messaging-ping-pong.rs @@ -17,7 +17,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod extra; +extern crate extra; use std::os; use std::uint; diff --git a/src/test/bench/rt-parfib.rs b/src/test/bench/rt-parfib.rs index 59f5afa47da..0512c2a3c96 100644 --- a/src/test/bench/rt-parfib.rs +++ b/src/test/bench/rt-parfib.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod extra; +extern crate extra; use std::os; use std::uint; diff --git a/src/test/bench/rt-spawn-rate.rs b/src/test/bench/rt-spawn-rate.rs index 20ecee5499f..40e6a0a7bed 100644 --- a/src/test/bench/rt-spawn-rate.rs +++ b/src/test/bench/rt-spawn-rate.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod extra; +extern crate extra; use std::task::spawn; use std::os; diff --git a/src/test/bench/shootout-ackermann.rs b/src/test/bench/shootout-ackermann.rs index a7f86b01b3f..d308ed6a7d1 100644 --- a/src/test/bench/shootout-ackermann.rs +++ b/src/test/bench/shootout-ackermann.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod extra; +extern crate extra; use std::os; diff --git a/src/test/bench/shootout-binarytrees.rs b/src/test/bench/shootout-binarytrees.rs index c0e22f207b8..18df0786872 100644 --- a/src/test/bench/shootout-binarytrees.rs +++ b/src/test/bench/shootout-binarytrees.rs @@ -8,8 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod sync; -extern mod arena; +extern crate sync; +extern crate arena; use std::iter::range_step; use sync::Future; diff --git a/src/test/bench/shootout-chameneos-redux.rs b/src/test/bench/shootout-chameneos-redux.rs index 5c237b306fb..a6bbea0ac14 100644 --- a/src/test/bench/shootout-chameneos-redux.rs +++ b/src/test/bench/shootout-chameneos-redux.rs @@ -10,7 +10,7 @@ // chameneos -extern mod extra; +extern crate extra; use std::option; use std::os; diff --git a/src/test/bench/shootout-fibo.rs b/src/test/bench/shootout-fibo.rs index d7a9dd86f4d..4a4b2e8e875 100644 --- a/src/test/bench/shootout-fibo.rs +++ b/src/test/bench/shootout-fibo.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod extra; +extern crate extra; use std::os; diff --git a/src/test/bench/shootout-k-nucleotide-pipes.rs b/src/test/bench/shootout-k-nucleotide-pipes.rs index 6f7630ebe8a..737e5c98214 100644 --- a/src/test/bench/shootout-k-nucleotide-pipes.rs +++ b/src/test/bench/shootout-k-nucleotide-pipes.rs @@ -13,7 +13,7 @@ // ignore-pretty the `let to_child` line gets an extra newline // multi tasking k-nucleotide -extern mod extra; +extern crate extra; use std::cmp::Ord; use std::comm; diff --git a/src/test/bench/shootout-k-nucleotide.rs b/src/test/bench/shootout-k-nucleotide.rs index bdad46bad2e..9190ff69347 100644 --- a/src/test/bench/shootout-k-nucleotide.rs +++ b/src/test/bench/shootout-k-nucleotide.rs @@ -10,7 +10,7 @@ // ignore-test -extern mod extra; +extern crate extra; use std::cast::transmute; use std::i32::range; diff --git a/src/test/bench/shootout-pfib.rs b/src/test/bench/shootout-pfib.rs index 7f4fd3cf94c..48aaa7d5b0a 100644 --- a/src/test/bench/shootout-pfib.rs +++ b/src/test/bench/shootout-pfib.rs @@ -18,8 +18,8 @@ */ -extern mod extra; -extern mod getopts; +extern crate extra; +extern crate getopts; use extra::time; use std::os; diff --git a/src/test/bench/shootout-pidigits.rs b/src/test/bench/shootout-pidigits.rs index 33f20cf0d1f..93ef2b7bb82 100644 --- a/src/test/bench/shootout-pidigits.rs +++ b/src/test/bench/shootout-pidigits.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod num; +extern crate num; use std::from_str::FromStr; use std::num::One; diff --git a/src/test/bench/shootout-spectralnorm.rs b/src/test/bench/shootout-spectralnorm.rs index a6e6713e137..02b3cfae1f4 100644 --- a/src/test/bench/shootout-spectralnorm.rs +++ b/src/test/bench/shootout-spectralnorm.rs @@ -10,7 +10,7 @@ // ignore-test arcs no longer unwrap -extern mod sync; +extern crate sync; use std::from_str::FromStr; use std::iter::count; diff --git a/src/test/bench/std-smallintmap.rs b/src/test/bench/std-smallintmap.rs index 58f667b929f..6f9c6abea1b 100644 --- a/src/test/bench/std-smallintmap.rs +++ b/src/test/bench/std-smallintmap.rs @@ -10,8 +10,8 @@ // Microbenchmark for the smallintmap library -extern mod extra; -extern mod collections; +extern crate extra; +extern crate collections; use collections::SmallIntMap; use std::os; diff --git a/src/test/bench/sudoku.rs b/src/test/bench/sudoku.rs index 371e07bc7d9..a4041ae1816 100644 --- a/src/test/bench/sudoku.rs +++ b/src/test/bench/sudoku.rs @@ -12,7 +12,7 @@ #[feature(managed_boxes)]; -extern mod extra; +extern crate extra; use std::io; use std::io::stdio::StdReader; diff --git a/src/test/bench/task-perf-alloc-unwind.rs b/src/test/bench/task-perf-alloc-unwind.rs index 42b564edbc5..013df3b3675 100644 --- a/src/test/bench/task-perf-alloc-unwind.rs +++ b/src/test/bench/task-perf-alloc-unwind.rs @@ -10,8 +10,8 @@ #[feature(managed_boxes)]; -extern mod extra; -extern mod collections; +extern crate extra; +extern crate collections; use collections::list::{List, Cons, Nil}; use extra::time::precise_time_s; diff --git a/src/test/compile-fail/ambig_impl_2_exe.rs b/src/test/compile-fail/ambig_impl_2_exe.rs index ca1e0293f8e..a7a02438530 100644 --- a/src/test/compile-fail/ambig_impl_2_exe.rs +++ b/src/test/compile-fail/ambig_impl_2_exe.rs @@ -10,7 +10,7 @@ // ignore-fast aux-build // aux-build:ambig_impl_2_lib.rs -extern mod ambig_impl_2_lib; +extern crate ambig_impl_2_lib; use ambig_impl_2_lib::me; trait me { fn me(&self) -> uint; diff --git a/src/test/compile-fail/arc-cant-nest-rw-arc-3177.rs b/src/test/compile-fail/arc-cant-nest-rw-arc-3177.rs index 5c55f10ab4f..151f4940d57 100644 --- a/src/test/compile-fail/arc-cant-nest-rw-arc-3177.rs +++ b/src/test/compile-fail/arc-cant-nest-rw-arc-3177.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod sync; +extern crate sync; use sync::RWArc; fn main() { diff --git a/src/test/compile-fail/arc-rw-cond-shouldnt-escape.rs b/src/test/compile-fail/arc-rw-cond-shouldnt-escape.rs index c9cd1327882..71d42d46e7c 100644 --- a/src/test/compile-fail/arc-rw-cond-shouldnt-escape.rs +++ b/src/test/compile-fail/arc-rw-cond-shouldnt-escape.rs @@ -9,7 +9,7 @@ // except according to those terms. // error-pattern: lifetime of return value does not outlive the function call -extern mod sync; +extern crate sync; use sync::RWArc; fn main() { let x = ~RWArc::new(1); diff --git a/src/test/compile-fail/arc-rw-read-mode-shouldnt-escape.rs b/src/test/compile-fail/arc-rw-read-mode-shouldnt-escape.rs index 653f37d96d4..1787cd5d0b4 100644 --- a/src/test/compile-fail/arc-rw-read-mode-shouldnt-escape.rs +++ b/src/test/compile-fail/arc-rw-read-mode-shouldnt-escape.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod sync; +extern crate sync; use sync::RWArc; fn main() { let x = ~RWArc::new(1); diff --git a/src/test/compile-fail/arc-rw-state-shouldnt-escape.rs b/src/test/compile-fail/arc-rw-state-shouldnt-escape.rs index 4bb7653d23e..cccca050696 100644 --- a/src/test/compile-fail/arc-rw-state-shouldnt-escape.rs +++ b/src/test/compile-fail/arc-rw-state-shouldnt-escape.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod sync; +extern crate sync; use sync::RWArc; fn main() { let x = ~RWArc::new(1); diff --git a/src/test/compile-fail/arc-rw-write-mode-cond-shouldnt-escape.rs b/src/test/compile-fail/arc-rw-write-mode-cond-shouldnt-escape.rs index 1410308107e..a08cb055020 100644 --- a/src/test/compile-fail/arc-rw-write-mode-cond-shouldnt-escape.rs +++ b/src/test/compile-fail/arc-rw-write-mode-cond-shouldnt-escape.rs @@ -9,7 +9,7 @@ // except according to those terms. // error-pattern: lifetime of variable does not enclose its declaration -extern mod sync; +extern crate sync; use sync::RWArc; fn main() { let x = ~RWArc::new(1); diff --git a/src/test/compile-fail/arc-rw-write-mode-shouldnt-escape.rs b/src/test/compile-fail/arc-rw-write-mode-shouldnt-escape.rs index 68226d96a18..8f93d672b90 100644 --- a/src/test/compile-fail/arc-rw-write-mode-shouldnt-escape.rs +++ b/src/test/compile-fail/arc-rw-write-mode-shouldnt-escape.rs @@ -9,7 +9,7 @@ // except according to those terms. // error-pattern: lifetime of variable does not enclose its declaration -extern mod sync; +extern crate sync; use sync::RWArc; fn main() { let x = ~RWArc::new(1); diff --git a/src/test/compile-fail/builtin-superkinds-in-metadata.rs b/src/test/compile-fail/builtin-superkinds-in-metadata.rs index 34dc69d7eca..bd85141171e 100644 --- a/src/test/compile-fail/builtin-superkinds-in-metadata.rs +++ b/src/test/compile-fail/builtin-superkinds-in-metadata.rs @@ -15,7 +15,7 @@ // Test for traits inheriting from the builtin kinds cross-crate. // Mostly tests correctness of metadata. -extern mod trait_superkinds_in_metadata; +extern crate trait_superkinds_in_metadata; use trait_superkinds_in_metadata::{RequiresRequiresFreezeAndSend, RequiresFreeze}; struct X(T); diff --git a/src/test/compile-fail/coherence_inherent_cc.rs b/src/test/compile-fail/coherence_inherent_cc.rs index e2a36ae1361..dcecbd5658d 100644 --- a/src/test/compile-fail/coherence_inherent_cc.rs +++ b/src/test/compile-fail/coherence_inherent_cc.rs @@ -14,7 +14,7 @@ // Tests that methods that implement a trait cannot be invoked // unless the trait is imported. -extern mod coherence_inherent_cc_lib; +extern crate coherence_inherent_cc_lib; mod Import { // Trait is in scope here: diff --git a/src/test/compile-fail/conflicting-implementations-aux.rs b/src/test/compile-fail/conflicting-implementations-aux.rs index 3a1f696193e..6c7722bbd25 100644 --- a/src/test/compile-fail/conflicting-implementations-aux.rs +++ b/src/test/compile-fail/conflicting-implementations-aux.rs @@ -12,7 +12,7 @@ // 'conflicting implementations' error message. // aux-build:trait_impl_conflict.rs -extern mod trait_impl_conflict; +extern crate trait_impl_conflict; use trait_impl_conflict::Foo; impl Foo for A { diff --git a/src/test/compile-fail/crateresolve1.rs b/src/test/compile-fail/crateresolve1.rs index c7aa2d32408..8c3dbda6802 100644 --- a/src/test/compile-fail/crateresolve1.rs +++ b/src/test/compile-fail/crateresolve1.rs @@ -13,7 +13,7 @@ // aux-build:crateresolve1-3.rs // error-pattern:multiple matching crates for `crateresolve1` -extern mod crateresolve1; +extern crate crateresolve1; fn main() { } diff --git a/src/test/compile-fail/crateresolve2.rs b/src/test/compile-fail/crateresolve2.rs index b1565d4b3a1..c5e9d128152 100644 --- a/src/test/compile-fail/crateresolve2.rs +++ b/src/test/compile-fail/crateresolve2.rs @@ -13,10 +13,10 @@ // aux-build:crateresolve2-3.rs // error-pattern:using multiple versions of crate `crateresolve2` -extern mod crateresolve2 = "crateresolve2#0.1"; +extern crate crateresolve2 = "crateresolve2#0.1"; mod m { - pub extern mod crateresolve2 = "crateresolve2#0.2"; + pub extern crate crateresolve2 = "crateresolve2#0.2"; } fn main() { diff --git a/src/test/compile-fail/crateresolve5.rs b/src/test/compile-fail/crateresolve5.rs index 127b7575a7e..124696630cc 100644 --- a/src/test/compile-fail/crateresolve5.rs +++ b/src/test/compile-fail/crateresolve5.rs @@ -12,8 +12,8 @@ // aux-build:crateresolve5-1.rs // aux-build:crateresolve5-2.rs -extern mod cr5_1 = "crateresolve5#0.1"; -extern mod cr5_2 = "crateresolve5#0.2"; +extern crate cr5_1 = "crateresolve5#0.1"; +extern crate cr5_2 = "crateresolve5#0.2"; fn main() { diff --git a/src/test/compile-fail/deriving-span-Clone-enum-struct-variant.rs b/src/test/compile-fail/deriving-span-Clone-enum-struct-variant.rs index 983156f9b4f..89839c06f3b 100644 --- a/src/test/compile-fail/deriving-span-Clone-enum-struct-variant.rs +++ b/src/test/compile-fail/deriving-span-Clone-enum-struct-variant.rs @@ -11,7 +11,7 @@ // This file was auto-generated using 'src/etc/generate-keyword-span-tests.py' #[feature(struct_variant)]; -extern mod extra; +extern crate extra; struct Error; diff --git a/src/test/compile-fail/deriving-span-Clone-enum.rs b/src/test/compile-fail/deriving-span-Clone-enum.rs index e5ceef886e1..4c47e77dd81 100644 --- a/src/test/compile-fail/deriving-span-Clone-enum.rs +++ b/src/test/compile-fail/deriving-span-Clone-enum.rs @@ -11,7 +11,7 @@ // This file was auto-generated using 'src/etc/generate-keyword-span-tests.py' #[feature(struct_variant)]; -extern mod extra; +extern crate extra; struct Error; diff --git a/src/test/compile-fail/deriving-span-Clone-struct.rs b/src/test/compile-fail/deriving-span-Clone-struct.rs index fd763df311c..1a2eb3fc640 100644 --- a/src/test/compile-fail/deriving-span-Clone-struct.rs +++ b/src/test/compile-fail/deriving-span-Clone-struct.rs @@ -11,7 +11,7 @@ // This file was auto-generated using 'src/etc/generate-keyword-span-tests.py' #[feature(struct_variant)]; -extern mod extra; +extern crate extra; struct Error; diff --git a/src/test/compile-fail/deriving-span-Clone-tuple-struct.rs b/src/test/compile-fail/deriving-span-Clone-tuple-struct.rs index d444c5e3161..03fb284b50b 100644 --- a/src/test/compile-fail/deriving-span-Clone-tuple-struct.rs +++ b/src/test/compile-fail/deriving-span-Clone-tuple-struct.rs @@ -11,7 +11,7 @@ // This file was auto-generated using 'src/etc/generate-keyword-span-tests.py' #[feature(struct_variant)]; -extern mod extra; +extern crate extra; struct Error; diff --git a/src/test/compile-fail/deriving-span-DeepClone-enum-struct-variant.rs b/src/test/compile-fail/deriving-span-DeepClone-enum-struct-variant.rs index 0dc6266bec4..7cee7b8ee0d 100644 --- a/src/test/compile-fail/deriving-span-DeepClone-enum-struct-variant.rs +++ b/src/test/compile-fail/deriving-span-DeepClone-enum-struct-variant.rs @@ -11,7 +11,7 @@ // This file was auto-generated using 'src/etc/generate-keyword-span-tests.py' #[feature(struct_variant)]; -extern mod extra; +extern crate extra; #[deriving(Clone)] struct Error; diff --git a/src/test/compile-fail/deriving-span-DeepClone-enum.rs b/src/test/compile-fail/deriving-span-DeepClone-enum.rs index 5b210d0ff79..c18ebe1758d 100644 --- a/src/test/compile-fail/deriving-span-DeepClone-enum.rs +++ b/src/test/compile-fail/deriving-span-DeepClone-enum.rs @@ -11,7 +11,7 @@ // This file was auto-generated using 'src/etc/generate-keyword-span-tests.py' #[feature(struct_variant)]; -extern mod extra; +extern crate extra; #[deriving(Clone)] struct Error; diff --git a/src/test/compile-fail/deriving-span-DeepClone-struct.rs b/src/test/compile-fail/deriving-span-DeepClone-struct.rs index f063ed58dce..7d33cd1a28d 100644 --- a/src/test/compile-fail/deriving-span-DeepClone-struct.rs +++ b/src/test/compile-fail/deriving-span-DeepClone-struct.rs @@ -11,7 +11,7 @@ // This file was auto-generated using 'src/etc/generate-keyword-span-tests.py' #[feature(struct_variant)]; -extern mod extra; +extern crate extra; #[deriving(Clone)] struct Error; diff --git a/src/test/compile-fail/deriving-span-DeepClone-tuple-struct.rs b/src/test/compile-fail/deriving-span-DeepClone-tuple-struct.rs index 1b053897c0e..42dd608f617 100644 --- a/src/test/compile-fail/deriving-span-DeepClone-tuple-struct.rs +++ b/src/test/compile-fail/deriving-span-DeepClone-tuple-struct.rs @@ -11,7 +11,7 @@ // This file was auto-generated using 'src/etc/generate-keyword-span-tests.py' #[feature(struct_variant)]; -extern mod extra; +extern crate extra; #[deriving(Clone)] struct Error; diff --git a/src/test/compile-fail/deriving-span-Default-struct.rs b/src/test/compile-fail/deriving-span-Default-struct.rs index 7c2edd8cb7b..21da9fef398 100644 --- a/src/test/compile-fail/deriving-span-Default-struct.rs +++ b/src/test/compile-fail/deriving-span-Default-struct.rs @@ -11,7 +11,7 @@ // This file was auto-generated using 'src/etc/generate-keyword-span-tests.py' #[feature(struct_variant)]; -extern mod extra; +extern crate extra; struct Error; diff --git a/src/test/compile-fail/deriving-span-Default-tuple-struct.rs b/src/test/compile-fail/deriving-span-Default-tuple-struct.rs index e0269a6aad3..2cfc7e2a259 100644 --- a/src/test/compile-fail/deriving-span-Default-tuple-struct.rs +++ b/src/test/compile-fail/deriving-span-Default-tuple-struct.rs @@ -11,7 +11,7 @@ // This file was auto-generated using 'src/etc/generate-keyword-span-tests.py' #[feature(struct_variant)]; -extern mod extra; +extern crate extra; struct Error; diff --git a/src/test/compile-fail/deriving-span-Eq-enum-struct-variant.rs b/src/test/compile-fail/deriving-span-Eq-enum-struct-variant.rs index abedb3e660f..ce3d84a2e9b 100644 --- a/src/test/compile-fail/deriving-span-Eq-enum-struct-variant.rs +++ b/src/test/compile-fail/deriving-span-Eq-enum-struct-variant.rs @@ -11,7 +11,7 @@ // This file was auto-generated using 'src/etc/generate-keyword-span-tests.py' #[feature(struct_variant)]; -extern mod extra; +extern crate extra; struct Error; diff --git a/src/test/compile-fail/deriving-span-Eq-enum.rs b/src/test/compile-fail/deriving-span-Eq-enum.rs index 3486d96205b..c59a81fd147 100644 --- a/src/test/compile-fail/deriving-span-Eq-enum.rs +++ b/src/test/compile-fail/deriving-span-Eq-enum.rs @@ -11,7 +11,7 @@ // This file was auto-generated using 'src/etc/generate-keyword-span-tests.py' #[feature(struct_variant)]; -extern mod extra; +extern crate extra; struct Error; diff --git a/src/test/compile-fail/deriving-span-Eq-struct.rs b/src/test/compile-fail/deriving-span-Eq-struct.rs index 32d2e78eabc..b797a0d7790 100644 --- a/src/test/compile-fail/deriving-span-Eq-struct.rs +++ b/src/test/compile-fail/deriving-span-Eq-struct.rs @@ -11,7 +11,7 @@ // This file was auto-generated using 'src/etc/generate-keyword-span-tests.py' #[feature(struct_variant)]; -extern mod extra; +extern crate extra; struct Error; diff --git a/src/test/compile-fail/deriving-span-Eq-tuple-struct.rs b/src/test/compile-fail/deriving-span-Eq-tuple-struct.rs index acc46a1002a..fb4d850ed11 100644 --- a/src/test/compile-fail/deriving-span-Eq-tuple-struct.rs +++ b/src/test/compile-fail/deriving-span-Eq-tuple-struct.rs @@ -11,7 +11,7 @@ // This file was auto-generated using 'src/etc/generate-keyword-span-tests.py' #[feature(struct_variant)]; -extern mod extra; +extern crate extra; struct Error; diff --git a/src/test/compile-fail/deriving-span-Ord-enum-struct-variant.rs b/src/test/compile-fail/deriving-span-Ord-enum-struct-variant.rs index 933da411db8..e3e442e70cf 100644 --- a/src/test/compile-fail/deriving-span-Ord-enum-struct-variant.rs +++ b/src/test/compile-fail/deriving-span-Ord-enum-struct-variant.rs @@ -11,7 +11,7 @@ // This file was auto-generated using 'src/etc/generate-keyword-span-tests.py' #[feature(struct_variant)]; -extern mod extra; +extern crate extra; struct Error; diff --git a/src/test/compile-fail/deriving-span-Ord-enum.rs b/src/test/compile-fail/deriving-span-Ord-enum.rs index c310965cfa1..41e6c2c9e8d 100644 --- a/src/test/compile-fail/deriving-span-Ord-enum.rs +++ b/src/test/compile-fail/deriving-span-Ord-enum.rs @@ -11,7 +11,7 @@ // This file was auto-generated using 'src/etc/generate-keyword-span-tests.py' #[feature(struct_variant)]; -extern mod extra; +extern crate extra; struct Error; diff --git a/src/test/compile-fail/deriving-span-Ord-struct.rs b/src/test/compile-fail/deriving-span-Ord-struct.rs index 327ac73ff2d..2caf68a26fc 100644 --- a/src/test/compile-fail/deriving-span-Ord-struct.rs +++ b/src/test/compile-fail/deriving-span-Ord-struct.rs @@ -11,7 +11,7 @@ // This file was auto-generated using 'src/etc/generate-keyword-span-tests.py' #[feature(struct_variant)]; -extern mod extra; +extern crate extra; struct Error; diff --git a/src/test/compile-fail/deriving-span-Ord-tuple-struct.rs b/src/test/compile-fail/deriving-span-Ord-tuple-struct.rs index 2a482f872c5..c783befa391 100644 --- a/src/test/compile-fail/deriving-span-Ord-tuple-struct.rs +++ b/src/test/compile-fail/deriving-span-Ord-tuple-struct.rs @@ -11,7 +11,7 @@ // This file was auto-generated using 'src/etc/generate-keyword-span-tests.py' #[feature(struct_variant)]; -extern mod extra; +extern crate extra; struct Error; diff --git a/src/test/compile-fail/deriving-span-Rand-enum-struct-variant.rs b/src/test/compile-fail/deriving-span-Rand-enum-struct-variant.rs index ae0732e4db6..615112c129e 100644 --- a/src/test/compile-fail/deriving-span-Rand-enum-struct-variant.rs +++ b/src/test/compile-fail/deriving-span-Rand-enum-struct-variant.rs @@ -11,7 +11,7 @@ // This file was auto-generated using 'src/etc/generate-keyword-span-tests.py' #[feature(struct_variant)]; -extern mod extra; +extern crate extra; struct Error; diff --git a/src/test/compile-fail/deriving-span-Rand-enum.rs b/src/test/compile-fail/deriving-span-Rand-enum.rs index ef29ce08292..a1943941e41 100644 --- a/src/test/compile-fail/deriving-span-Rand-enum.rs +++ b/src/test/compile-fail/deriving-span-Rand-enum.rs @@ -11,7 +11,7 @@ // This file was auto-generated using 'src/etc/generate-keyword-span-tests.py' #[feature(struct_variant)]; -extern mod extra; +extern crate extra; struct Error; diff --git a/src/test/compile-fail/deriving-span-Rand-struct.rs b/src/test/compile-fail/deriving-span-Rand-struct.rs index 2ce4d49e721..00d9c1de5c5 100644 --- a/src/test/compile-fail/deriving-span-Rand-struct.rs +++ b/src/test/compile-fail/deriving-span-Rand-struct.rs @@ -11,7 +11,7 @@ // This file was auto-generated using 'src/etc/generate-keyword-span-tests.py' #[feature(struct_variant)]; -extern mod extra; +extern crate extra; struct Error; diff --git a/src/test/compile-fail/deriving-span-Rand-tuple-struct.rs b/src/test/compile-fail/deriving-span-Rand-tuple-struct.rs index 3f6738fd306..c61a7c76bfb 100644 --- a/src/test/compile-fail/deriving-span-Rand-tuple-struct.rs +++ b/src/test/compile-fail/deriving-span-Rand-tuple-struct.rs @@ -11,7 +11,7 @@ // This file was auto-generated using 'src/etc/generate-keyword-span-tests.py' #[feature(struct_variant)]; -extern mod extra; +extern crate extra; struct Error; diff --git a/src/test/compile-fail/deriving-span-Show-enum-struct-variant.rs b/src/test/compile-fail/deriving-span-Show-enum-struct-variant.rs index 582c95b746b..e22b51d19e5 100644 --- a/src/test/compile-fail/deriving-span-Show-enum-struct-variant.rs +++ b/src/test/compile-fail/deriving-span-Show-enum-struct-variant.rs @@ -11,7 +11,7 @@ // This file was auto-generated using 'src/etc/generate-keyword-span-tests.py' #[feature(struct_variant)]; -extern mod extra; +extern crate extra; struct Error; diff --git a/src/test/compile-fail/deriving-span-Show-enum.rs b/src/test/compile-fail/deriving-span-Show-enum.rs index 92efe01fa38..fffbd49a2bb 100644 --- a/src/test/compile-fail/deriving-span-Show-enum.rs +++ b/src/test/compile-fail/deriving-span-Show-enum.rs @@ -11,7 +11,7 @@ // This file was auto-generated using 'src/etc/generate-keyword-span-tests.py' #[feature(struct_variant)]; -extern mod extra; +extern crate extra; struct Error; diff --git a/src/test/compile-fail/deriving-span-Show-struct.rs b/src/test/compile-fail/deriving-span-Show-struct.rs index 7eff82f9d13..45afd4454e8 100644 --- a/src/test/compile-fail/deriving-span-Show-struct.rs +++ b/src/test/compile-fail/deriving-span-Show-struct.rs @@ -11,7 +11,7 @@ // This file was auto-generated using 'src/etc/generate-keyword-span-tests.py' #[feature(struct_variant)]; -extern mod extra; +extern crate extra; struct Error; diff --git a/src/test/compile-fail/deriving-span-Show-tuple-struct.rs b/src/test/compile-fail/deriving-span-Show-tuple-struct.rs index 600a0400350..1a199974eba 100644 --- a/src/test/compile-fail/deriving-span-Show-tuple-struct.rs +++ b/src/test/compile-fail/deriving-span-Show-tuple-struct.rs @@ -11,7 +11,7 @@ // This file was auto-generated using 'src/etc/generate-keyword-span-tests.py' #[feature(struct_variant)]; -extern mod extra; +extern crate extra; struct Error; diff --git a/src/test/compile-fail/deriving-span-TotalEq-enum-struct-variant.rs b/src/test/compile-fail/deriving-span-TotalEq-enum-struct-variant.rs index 8e55609a515..f054e9e7e77 100644 --- a/src/test/compile-fail/deriving-span-TotalEq-enum-struct-variant.rs +++ b/src/test/compile-fail/deriving-span-TotalEq-enum-struct-variant.rs @@ -11,7 +11,7 @@ // This file was auto-generated using 'src/etc/generate-keyword-span-tests.py' #[feature(struct_variant)]; -extern mod extra; +extern crate extra; struct Error; diff --git a/src/test/compile-fail/deriving-span-TotalEq-enum.rs b/src/test/compile-fail/deriving-span-TotalEq-enum.rs index 968f0420687..38b8d55bcd8 100644 --- a/src/test/compile-fail/deriving-span-TotalEq-enum.rs +++ b/src/test/compile-fail/deriving-span-TotalEq-enum.rs @@ -11,7 +11,7 @@ // This file was auto-generated using 'src/etc/generate-keyword-span-tests.py' #[feature(struct_variant)]; -extern mod extra; +extern crate extra; struct Error; diff --git a/src/test/compile-fail/deriving-span-TotalEq-struct.rs b/src/test/compile-fail/deriving-span-TotalEq-struct.rs index 8c53d1167f1..66e5ef57a00 100644 --- a/src/test/compile-fail/deriving-span-TotalEq-struct.rs +++ b/src/test/compile-fail/deriving-span-TotalEq-struct.rs @@ -11,7 +11,7 @@ // This file was auto-generated using 'src/etc/generate-keyword-span-tests.py' #[feature(struct_variant)]; -extern mod extra; +extern crate extra; struct Error; diff --git a/src/test/compile-fail/deriving-span-TotalEq-tuple-struct.rs b/src/test/compile-fail/deriving-span-TotalEq-tuple-struct.rs index 16d49954dce..dd0be2dc04a 100644 --- a/src/test/compile-fail/deriving-span-TotalEq-tuple-struct.rs +++ b/src/test/compile-fail/deriving-span-TotalEq-tuple-struct.rs @@ -11,7 +11,7 @@ // This file was auto-generated using 'src/etc/generate-keyword-span-tests.py' #[feature(struct_variant)]; -extern mod extra; +extern crate extra; struct Error; diff --git a/src/test/compile-fail/deriving-span-TotalOrd-enum-struct-variant.rs b/src/test/compile-fail/deriving-span-TotalOrd-enum-struct-variant.rs index fe598906c02..76bcd332562 100644 --- a/src/test/compile-fail/deriving-span-TotalOrd-enum-struct-variant.rs +++ b/src/test/compile-fail/deriving-span-TotalOrd-enum-struct-variant.rs @@ -11,7 +11,7 @@ // This file was auto-generated using 'src/etc/generate-keyword-span-tests.py' #[feature(struct_variant)]; -extern mod extra; +extern crate extra; #[deriving(TotalEq)] struct Error; diff --git a/src/test/compile-fail/deriving-span-TotalOrd-enum.rs b/src/test/compile-fail/deriving-span-TotalOrd-enum.rs index 6bccd22c45f..303e35108fe 100644 --- a/src/test/compile-fail/deriving-span-TotalOrd-enum.rs +++ b/src/test/compile-fail/deriving-span-TotalOrd-enum.rs @@ -11,7 +11,7 @@ // This file was auto-generated using 'src/etc/generate-keyword-span-tests.py' #[feature(struct_variant)]; -extern mod extra; +extern crate extra; #[deriving(TotalEq)] struct Error; diff --git a/src/test/compile-fail/deriving-span-TotalOrd-struct.rs b/src/test/compile-fail/deriving-span-TotalOrd-struct.rs index 4ff48824a7b..bbcc3ae7e04 100644 --- a/src/test/compile-fail/deriving-span-TotalOrd-struct.rs +++ b/src/test/compile-fail/deriving-span-TotalOrd-struct.rs @@ -11,7 +11,7 @@ // This file was auto-generated using 'src/etc/generate-keyword-span-tests.py' #[feature(struct_variant)]; -extern mod extra; +extern crate extra; #[deriving(TotalEq)] struct Error; diff --git a/src/test/compile-fail/deriving-span-TotalOrd-tuple-struct.rs b/src/test/compile-fail/deriving-span-TotalOrd-tuple-struct.rs index 08e2c9bcd7d..4e8697749e7 100644 --- a/src/test/compile-fail/deriving-span-TotalOrd-tuple-struct.rs +++ b/src/test/compile-fail/deriving-span-TotalOrd-tuple-struct.rs @@ -11,7 +11,7 @@ // This file was auto-generated using 'src/etc/generate-keyword-span-tests.py' #[feature(struct_variant)]; -extern mod extra; +extern crate extra; #[deriving(TotalEq)] struct Error; diff --git a/src/test/compile-fail/deriving-span-Zero-struct.rs b/src/test/compile-fail/deriving-span-Zero-struct.rs index 2892938926b..7256b1179db 100644 --- a/src/test/compile-fail/deriving-span-Zero-struct.rs +++ b/src/test/compile-fail/deriving-span-Zero-struct.rs @@ -11,7 +11,7 @@ // This file was auto-generated using 'src/etc/generate-keyword-span-tests.py' #[feature(struct_variant)]; -extern mod extra; +extern crate extra; struct Error; diff --git a/src/test/compile-fail/deriving-span-Zero-tuple-struct.rs b/src/test/compile-fail/deriving-span-Zero-tuple-struct.rs index 43d84a593ed..d483a86fddb 100644 --- a/src/test/compile-fail/deriving-span-Zero-tuple-struct.rs +++ b/src/test/compile-fail/deriving-span-Zero-tuple-struct.rs @@ -11,7 +11,7 @@ // This file was auto-generated using 'src/etc/generate-keyword-span-tests.py' #[feature(struct_variant)]; -extern mod extra; +extern crate extra; struct Error; diff --git a/src/test/compile-fail/functional-struct-update-noncopyable.rs b/src/test/compile-fail/functional-struct-update-noncopyable.rs index 5b634818d44..244ae47a277 100644 --- a/src/test/compile-fail/functional-struct-update-noncopyable.rs +++ b/src/test/compile-fail/functional-struct-update-noncopyable.rs @@ -11,7 +11,7 @@ // issue 7327 // ignore-fast #7103 -extern mod sync; +extern crate sync; use sync::Arc; struct A { y: Arc, x: Arc } diff --git a/src/test/compile-fail/future_not_copyable.rs b/src/test/compile-fail/future_not_copyable.rs index 69a90275ec7..e44efc140a5 100644 --- a/src/test/compile-fail/future_not_copyable.rs +++ b/src/test/compile-fail/future_not_copyable.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod sync; +extern crate sync; use sync::Future; diff --git a/src/test/compile-fail/gated-non-ascii-idents.rs b/src/test/compile-fail/gated-non-ascii-idents.rs index 96814e11049..f37a6aa354a 100644 --- a/src/test/compile-fail/gated-non-ascii-idents.rs +++ b/src/test/compile-fail/gated-non-ascii-idents.rs @@ -12,7 +12,7 @@ #[feature(struct_variant)]; -extern mod bäz; //~ ERROR non-ascii idents +extern crate bäz; //~ ERROR non-ascii idents use föö::bar; //~ ERROR non-ascii idents diff --git a/src/test/compile-fail/gated-phase.rs b/src/test/compile-fail/gated-phase.rs index 3a801e1351a..416a7691ceb 100644 --- a/src/test/compile-fail/gated-phase.rs +++ b/src/test/compile-fail/gated-phase.rs @@ -12,6 +12,6 @@ #[phase(syntax)] //~^ ERROR compile time crate loading is experimental and possibly buggy -extern mod macro_crate_test; +extern crate macro_crate_test; fn main() {} diff --git a/src/test/compile-fail/gated-simd.rs b/src/test/compile-fail/gated-simd.rs index a000b91dfde..59c44bff3c7 100644 --- a/src/test/compile-fail/gated-simd.rs +++ b/src/test/compile-fail/gated-simd.rs @@ -11,4 +11,4 @@ #[simd] pub struct i64x2(i64, i64); //~ ERROR: SIMD types are experimental -fn main() {} \ No newline at end of file +fn main() {} diff --git a/src/test/compile-fail/issue-11593.rs b/src/test/compile-fail/issue-11593.rs index 9ca91f067ba..ecc584d81b0 100644 --- a/src/test/compile-fail/issue-11593.rs +++ b/src/test/compile-fail/issue-11593.rs @@ -10,7 +10,7 @@ // aux-build:private_trait_xc.rs -extern mod private_trait_xc; +extern crate private_trait_xc; struct Bar; diff --git a/src/test/compile-fail/issue-3021-b.rs b/src/test/compile-fail/issue-3021-b.rs index 641403fb85a..038b2b0d876 100644 --- a/src/test/compile-fail/issue-3021-b.rs +++ b/src/test/compile-fail/issue-3021-b.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod extra; +extern crate extra; fn siphash(k0 : u64) { diff --git a/src/test/compile-fail/issue-3021-c.rs b/src/test/compile-fail/issue-3021-c.rs index a0b78a4bc79..392cc2f3c90 100644 --- a/src/test/compile-fail/issue-3021-c.rs +++ b/src/test/compile-fail/issue-3021-c.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod extra; +extern crate extra; fn siphash() { diff --git a/src/test/compile-fail/issue-3021-d.rs b/src/test/compile-fail/issue-3021-d.rs index c5ee9e8bb90..95c0eb711e8 100644 --- a/src/test/compile-fail/issue-3021-d.rs +++ b/src/test/compile-fail/issue-3021-d.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod extra; +extern crate extra; trait siphash { fn result(&self) -> u64; diff --git a/src/test/compile-fail/issue-3021.rs b/src/test/compile-fail/issue-3021.rs index 56ade814db0..7bb1faf514a 100644 --- a/src/test/compile-fail/issue-3021.rs +++ b/src/test/compile-fail/issue-3021.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod extra; +extern crate extra; trait SipHash { fn reset(&self); diff --git a/src/test/compile-fail/issue-3907.rs b/src/test/compile-fail/issue-3907.rs index df18a5ad2d3..5d292531b49 100644 --- a/src/test/compile-fail/issue-3907.rs +++ b/src/test/compile-fail/issue-3907.rs @@ -9,7 +9,7 @@ // except according to those terms. // aux-build:issue_3907.rs -extern mod issue_3907; +extern crate issue_3907; type Foo = issue_3907::Foo; //~ ERROR: reference to trait diff --git a/src/test/compile-fail/issue-5844.rs b/src/test/compile-fail/issue-5844.rs index 9d4c3cfa678..6c85a97f7f5 100644 --- a/src/test/compile-fail/issue-5844.rs +++ b/src/test/compile-fail/issue-5844.rs @@ -10,7 +10,7 @@ //aux-build:issue_5844_aux.rs -extern mod issue_5844_aux; +extern crate issue_5844_aux; fn main () { issue_5844_aux::rand(); //~ ERROR: requires unsafe diff --git a/src/test/compile-fail/issue-9957.rs b/src/test/compile-fail/issue-9957.rs index b8292d61752..da90c4ee753 100644 --- a/src/test/compile-fail/issue-9957.rs +++ b/src/test/compile-fail/issue-9957.rs @@ -8,9 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -pub extern mod std; //~ ERROR: `pub` visibility is not allowed -priv extern mod std; //~ ERROR: unnecessary visibility qualifier -extern mod std; +pub extern crate std; //~ ERROR: `pub` visibility is not allowed +priv extern crate std; //~ ERROR: unnecessary visibility qualifier +extern crate std; pub use std::bool; priv use std::bool; //~ ERROR: unnecessary visibility qualifier diff --git a/src/test/compile-fail/lint-stability.rs b/src/test/compile-fail/lint-stability.rs index 84a17078116..f45f654229f 100644 --- a/src/test/compile-fail/lint-stability.rs +++ b/src/test/compile-fail/lint-stability.rs @@ -18,7 +18,7 @@ #[allow(dead_code)]; mod cross_crate { - extern mod lint_stability; + extern crate lint_stability; use self::lint_stability::*; fn test() { diff --git a/src/test/compile-fail/log-syntax-gate.rs b/src/test/compile-fail/log-syntax-gate.rs index b74c1d61eb8..63c66e53c5e 100644 --- a/src/test/compile-fail/log-syntax-gate.rs +++ b/src/test/compile-fail/log-syntax-gate.rs @@ -10,4 +10,4 @@ fn main() { log_syntax!() //~ ERROR `log_syntax!` is not stable enough -} \ No newline at end of file +} diff --git a/src/test/compile-fail/macro-crate-unexported-macro.rs b/src/test/compile-fail/macro-crate-unexported-macro.rs index e111393d9a7..aaf89807ced 100644 --- a/src/test/compile-fail/macro-crate-unexported-macro.rs +++ b/src/test/compile-fail/macro-crate-unexported-macro.rs @@ -15,7 +15,7 @@ #[feature(phase)]; #[phase(syntax)] -extern mod macro_crate_test; +extern crate macro_crate_test; fn main() { assert_eq!(3, unexported_macro!()); //~ ERROR macro undefined: 'unexported_macro' diff --git a/src/test/compile-fail/macro-crate-unknown-crate.rs b/src/test/compile-fail/macro-crate-unknown-crate.rs index 83538fcf454..3301eb145ce 100644 --- a/src/test/compile-fail/macro-crate-unknown-crate.rs +++ b/src/test/compile-fail/macro-crate-unknown-crate.rs @@ -11,6 +11,6 @@ #[feature(phase)]; #[phase(syntax)] -extern mod doesnt_exist; //~ ERROR can't find crate +extern crate doesnt_exist; //~ ERROR can't find crate fn main() {} diff --git a/src/test/compile-fail/moves-based-on-type-cyclic-types-issue-4821.rs b/src/test/compile-fail/moves-based-on-type-cyclic-types-issue-4821.rs index 7c01ddb6c93..97a2b00ba42 100644 --- a/src/test/compile-fail/moves-based-on-type-cyclic-types-issue-4821.rs +++ b/src/test/compile-fail/moves-based-on-type-cyclic-types-issue-4821.rs @@ -12,7 +12,7 @@ // temporary kinds wound up being stored in a cache and used later. // See middle::ty::type_contents() for more information. -extern mod extra; +extern crate extra; struct List { key: int, next: Option<~List> } diff --git a/src/test/compile-fail/mutex-arc-nested.rs b/src/test/compile-fail/mutex-arc-nested.rs index cdfdd29410e..34c56f98404 100644 --- a/src/test/compile-fail/mutex-arc-nested.rs +++ b/src/test/compile-fail/mutex-arc-nested.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod sync; +extern crate sync; use std::task; use sync::MutexArc; diff --git a/src/test/compile-fail/no-capture-arc.rs b/src/test/compile-fail/no-capture-arc.rs index cc529abd6f9..8df156d8332 100644 --- a/src/test/compile-fail/no-capture-arc.rs +++ b/src/test/compile-fail/no-capture-arc.rs @@ -10,7 +10,7 @@ // error-pattern: use of moved value -extern mod sync; +extern crate sync; use sync::Arc; use std::task; diff --git a/src/test/compile-fail/no-reuse-move-arc.rs b/src/test/compile-fail/no-reuse-move-arc.rs index 204a0e1cdd4..b387d3a1719 100644 --- a/src/test/compile-fail/no-reuse-move-arc.rs +++ b/src/test/compile-fail/no-reuse-move-arc.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod sync; +extern crate sync; use sync::Arc; use std::task; diff --git a/src/test/compile-fail/noexporttypeexe.rs b/src/test/compile-fail/noexporttypeexe.rs index 3add0134d00..7091995fa77 100644 --- a/src/test/compile-fail/noexporttypeexe.rs +++ b/src/test/compile-fail/noexporttypeexe.rs @@ -10,7 +10,7 @@ // aux-build:noexporttypelib.rs -extern mod noexporttypelib; +extern crate noexporttypelib; fn main() { // Here, the type returned by foo() is not exported. diff --git a/src/test/compile-fail/once-cant-call-twice-on-heap.rs b/src/test/compile-fail/once-cant-call-twice-on-heap.rs index a7e4f8de437..675dcf95595 100644 --- a/src/test/compile-fail/once-cant-call-twice-on-heap.rs +++ b/src/test/compile-fail/once-cant-call-twice-on-heap.rs @@ -12,7 +12,7 @@ // This program would segfault if it were legal. #[feature(once_fns)]; -extern mod sync; +extern crate sync; use sync::Arc; fn foo(blk: proc()) { diff --git a/src/test/compile-fail/once-cant-call-twice-on-stack.rs b/src/test/compile-fail/once-cant-call-twice-on-stack.rs index 8b168dd6787..48dd484c1c2 100644 --- a/src/test/compile-fail/once-cant-call-twice-on-stack.rs +++ b/src/test/compile-fail/once-cant-call-twice-on-stack.rs @@ -12,7 +12,7 @@ // This program would segfault if it were legal. #[feature(once_fns)]; -extern mod sync; +extern crate sync; use sync::Arc; fn foo(blk: once ||) { diff --git a/src/test/compile-fail/once-cant-move-out-of-non-once-on-stack.rs b/src/test/compile-fail/once-cant-move-out-of-non-once-on-stack.rs index 4fa6b6af794..804ea46b426 100644 --- a/src/test/compile-fail/once-cant-move-out-of-non-once-on-stack.rs +++ b/src/test/compile-fail/once-cant-move-out-of-non-once-on-stack.rs @@ -11,7 +11,7 @@ // Testing guarantees provided by once functions. // This program would segfault if it were legal. -extern mod sync; +extern crate sync; use sync::Arc; fn foo(blk: ||) { diff --git a/src/test/compile-fail/pattern-tyvar-2.rs b/src/test/compile-fail/pattern-tyvar-2.rs index a26733ebcee..e58c4b14685 100644 --- a/src/test/compile-fail/pattern-tyvar-2.rs +++ b/src/test/compile-fail/pattern-tyvar-2.rs @@ -9,7 +9,7 @@ // except according to those terms. -extern mod extra; +extern crate extra; enum bar { t1((), Option<~[int]>), t2, } diff --git a/src/test/compile-fail/pattern-tyvar.rs b/src/test/compile-fail/pattern-tyvar.rs index b3e907f913f..b687a225754 100644 --- a/src/test/compile-fail/pattern-tyvar.rs +++ b/src/test/compile-fail/pattern-tyvar.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod extra; +extern crate extra; // error-pattern: mismatched types diff --git a/src/test/compile-fail/phase-syntax-doesnt-resolve.rs b/src/test/compile-fail/phase-syntax-doesnt-resolve.rs index 8561006fbe9..8efa910f7c6 100644 --- a/src/test/compile-fail/phase-syntax-doesnt-resolve.rs +++ b/src/test/compile-fail/phase-syntax-doesnt-resolve.rs @@ -15,7 +15,7 @@ #[feature(phase)]; #[phase(syntax)] -extern mod macro_crate_test; +extern crate macro_crate_test; fn main() { macro_crate_test::foo(); diff --git a/src/test/compile-fail/private-method-cross-crate.rs b/src/test/compile-fail/private-method-cross-crate.rs index 4e5645c00c7..2e79c0f46ad 100644 --- a/src/test/compile-fail/private-method-cross-crate.rs +++ b/src/test/compile-fail/private-method-cross-crate.rs @@ -10,7 +10,7 @@ // ignore-fast // aux-build:cci_class_5.rs -extern mod cci_class_5; +extern crate cci_class_5; use cci_class_5::kitties::cat; fn main() { diff --git a/src/test/compile-fail/private-struct-field-cross-crate.rs b/src/test/compile-fail/private-struct-field-cross-crate.rs index 0b46e8d0a82..0993ac9a64a 100644 --- a/src/test/compile-fail/private-struct-field-cross-crate.rs +++ b/src/test/compile-fail/private-struct-field-cross-crate.rs @@ -9,7 +9,7 @@ // except according to those terms. // aux-build:cci_class.rs -extern mod cci_class; +extern crate cci_class; use cci_class::kitties::cat; fn main() { diff --git a/src/test/compile-fail/private-variant-xc.rs b/src/test/compile-fail/private-variant-xc.rs index d6c614b7070..5a252eb2975 100644 --- a/src/test/compile-fail/private-variant-xc.rs +++ b/src/test/compile-fail/private-variant-xc.rs @@ -11,7 +11,7 @@ // ignore-test // aux-build:private_variant_xc.rs -extern mod private_variant_xc; +extern crate private_variant_xc; pub fn main() { let _ = private_variant_xc::Bar; diff --git a/src/test/compile-fail/private_variant_2.rs b/src/test/compile-fail/private_variant_2.rs index 86f1a97b1d6..4afbe7ed48b 100644 --- a/src/test/compile-fail/private_variant_2.rs +++ b/src/test/compile-fail/private_variant_2.rs @@ -11,7 +11,7 @@ // ignore-test // aux-build:private_variant_1.rs -extern mod private_variant_1; +extern crate private_variant_1; fn main() { let _x = private_variant_1::super_sekrit::baz; //~ ERROR baz is private diff --git a/src/test/compile-fail/qquote-1.rs b/src/test/compile-fail/qquote-1.rs index cc3513b8fe6..d45759e38d9 100644 --- a/src/test/compile-fail/qquote-1.rs +++ b/src/test/compile-fail/qquote-1.rs @@ -12,8 +12,8 @@ #[feature(quote)]; -extern mod extra; -extern mod syntax; +extern crate extra; +extern crate syntax; use io::*; diff --git a/src/test/compile-fail/qquote-2.rs b/src/test/compile-fail/qquote-2.rs index 165a1e2663c..b5c2dee61c7 100644 --- a/src/test/compile-fail/qquote-2.rs +++ b/src/test/compile-fail/qquote-2.rs @@ -12,8 +12,8 @@ #[feature(quote)]; -extern mod extra; -extern mod syntax; +extern crate extra; +extern crate syntax; use extra::io::*; diff --git a/src/test/compile-fail/regions-glb-free-free.rs b/src/test/compile-fail/regions-glb-free-free.rs index 1aafd9057c2..8453ace2b51 100644 --- a/src/test/compile-fail/regions-glb-free-free.rs +++ b/src/test/compile-fail/regions-glb-free-free.rs @@ -9,7 +9,7 @@ // except according to those terms. mod argparse { - extern mod extra; + extern crate extra; pub struct Flag<'a> { name: &'a str, diff --git a/src/test/compile-fail/seq-args.rs b/src/test/compile-fail/seq-args.rs index a6ab41a3d6b..f543d442a23 100644 --- a/src/test/compile-fail/seq-args.rs +++ b/src/test/compile-fail/seq-args.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod extra; +extern crate extra; fn main() { trait seq { } diff --git a/src/test/compile-fail/spawn-non-nil-fn.rs b/src/test/compile-fail/spawn-non-nil-fn.rs index 8db2c686f30..e82c49d977f 100644 --- a/src/test/compile-fail/spawn-non-nil-fn.rs +++ b/src/test/compile-fail/spawn-non-nil-fn.rs @@ -10,7 +10,7 @@ // error-pattern: mismatched types -extern mod extra; +extern crate extra; use std::task; diff --git a/src/test/compile-fail/static-priv-by-default.rs b/src/test/compile-fail/static-priv-by-default.rs index 24a2b561a8b..98b37242c03 100644 --- a/src/test/compile-fail/static-priv-by-default.rs +++ b/src/test/compile-fail/static-priv-by-default.rs @@ -10,7 +10,7 @@ // aux-build:static_priv_by_default.rs -extern mod static_priv_by_default; +extern crate static_priv_by_default; mod child { pub mod childs_child { diff --git a/src/test/compile-fail/static-priv-by-default2.rs b/src/test/compile-fail/static-priv-by-default2.rs index 423d182dd69..2141099c7aa 100644 --- a/src/test/compile-fail/static-priv-by-default2.rs +++ b/src/test/compile-fail/static-priv-by-default2.rs @@ -10,7 +10,7 @@ // aux-build:static_priv_by_default.rs -extern mod static_priv_by_default; +extern crate static_priv_by_default; mod child { pub mod childs_child { diff --git a/src/test/compile-fail/struct-field-privacy.rs b/src/test/compile-fail/struct-field-privacy.rs index f3169004785..d298d331a3f 100644 --- a/src/test/compile-fail/struct-field-privacy.rs +++ b/src/test/compile-fail/struct-field-privacy.rs @@ -10,7 +10,7 @@ // aux-build:struct-field-privacy.rs -extern mod xc = "struct-field-privacy"; +extern crate xc = "struct-field-privacy"; struct A { a: int, diff --git a/src/test/compile-fail/sync-cond-shouldnt-escape.rs b/src/test/compile-fail/sync-cond-shouldnt-escape.rs index 06b8ad6259b..4ba1c5c7cfe 100644 --- a/src/test/compile-fail/sync-cond-shouldnt-escape.rs +++ b/src/test/compile-fail/sync-cond-shouldnt-escape.rs @@ -9,7 +9,7 @@ // except according to those terms. // error-pattern: lifetime of variable does not enclose its declaration -extern mod sync; +extern crate sync; use sync::Mutex; fn main() { diff --git a/src/test/compile-fail/sync-rwlock-cond-shouldnt-escape.rs b/src/test/compile-fail/sync-rwlock-cond-shouldnt-escape.rs index 52466c122dd..697858f40da 100644 --- a/src/test/compile-fail/sync-rwlock-cond-shouldnt-escape.rs +++ b/src/test/compile-fail/sync-rwlock-cond-shouldnt-escape.rs @@ -9,7 +9,7 @@ // except according to those terms. // error-pattern: lifetime of method receiver does not outlive the method call -extern mod sync; +extern crate sync; use sync::RWLock; fn main() { let x = ~RWLock::new(); diff --git a/src/test/compile-fail/sync-rwlock-read-mode-shouldnt-escape.rs b/src/test/compile-fail/sync-rwlock-read-mode-shouldnt-escape.rs index cb6c11537c6..30ed0912f6a 100644 --- a/src/test/compile-fail/sync-rwlock-read-mode-shouldnt-escape.rs +++ b/src/test/compile-fail/sync-rwlock-read-mode-shouldnt-escape.rs @@ -9,7 +9,7 @@ // except according to those terms. // error-pattern: cannot infer -extern mod sync; +extern crate sync; use sync::RWLock; fn main() { let x = ~RWLock::new(); diff --git a/src/test/compile-fail/sync-rwlock-write-mode-cond-shouldnt-escape.rs b/src/test/compile-fail/sync-rwlock-write-mode-cond-shouldnt-escape.rs index 71a9dd100c3..09b4e34ea8c 100644 --- a/src/test/compile-fail/sync-rwlock-write-mode-cond-shouldnt-escape.rs +++ b/src/test/compile-fail/sync-rwlock-write-mode-cond-shouldnt-escape.rs @@ -9,7 +9,7 @@ // except according to those terms. // error-pattern: lifetime of variable does not enclose its declaration -extern mod sync; +extern crate sync; use sync::RWLock; fn main() { let x = ~RWLock::new(); diff --git a/src/test/compile-fail/sync-rwlock-write-mode-shouldnt-escape.rs b/src/test/compile-fail/sync-rwlock-write-mode-shouldnt-escape.rs index 53966bf48a4..0fca360d0ce 100644 --- a/src/test/compile-fail/sync-rwlock-write-mode-shouldnt-escape.rs +++ b/src/test/compile-fail/sync-rwlock-write-mode-shouldnt-escape.rs @@ -9,7 +9,7 @@ // except according to those terms. // error-pattern: lifetime of variable does not enclose its declaration -extern mod sync; +extern crate sync; use sync::RWLock; fn main() { let x = ~RWLock::new(); diff --git a/src/test/compile-fail/syntax-extension-fourcc-bad-len.rs b/src/test/compile-fail/syntax-extension-fourcc-bad-len.rs index 61594e642bf..920726a4870 100644 --- a/src/test/compile-fail/syntax-extension-fourcc-bad-len.rs +++ b/src/test/compile-fail/syntax-extension-fourcc-bad-len.rs @@ -15,7 +15,7 @@ #[feature(phase)]; #[phase(syntax)] -extern mod fourcc; +extern crate fourcc; fn main() { let val = fourcc!("foo"); //~ ERROR string literal with len != 4 in fourcc! diff --git a/src/test/compile-fail/syntax-extension-fourcc-invalid-endian.rs b/src/test/compile-fail/syntax-extension-fourcc-invalid-endian.rs index bfc755eda33..08ee57a2d94 100644 --- a/src/test/compile-fail/syntax-extension-fourcc-invalid-endian.rs +++ b/src/test/compile-fail/syntax-extension-fourcc-invalid-endian.rs @@ -15,7 +15,7 @@ #[feature(phase)]; #[phase(syntax)] -extern mod fourcc; +extern crate fourcc; fn main() { let val = fourcc!("foo ", bork); //~ ERROR invalid endian directive in fourcc! diff --git a/src/test/compile-fail/syntax-extension-fourcc-non-ascii-str.rs b/src/test/compile-fail/syntax-extension-fourcc-non-ascii-str.rs index 7b090e3e947..af49d9988d8 100644 --- a/src/test/compile-fail/syntax-extension-fourcc-non-ascii-str.rs +++ b/src/test/compile-fail/syntax-extension-fourcc-non-ascii-str.rs @@ -15,7 +15,7 @@ #[feature(phase)]; #[phase(syntax)] -extern mod fourcc; +extern crate fourcc; fn main() { let v = fourcc!("fooλ"); //~ ERROR fourcc! literal character out of range 0-255 diff --git a/src/test/compile-fail/syntax-extension-fourcc-non-literal.rs b/src/test/compile-fail/syntax-extension-fourcc-non-literal.rs index 5f6446c683c..b4195ed9bc8 100644 --- a/src/test/compile-fail/syntax-extension-fourcc-non-literal.rs +++ b/src/test/compile-fail/syntax-extension-fourcc-non-literal.rs @@ -15,7 +15,7 @@ #[feature(phase)]; #[phase(syntax)] -extern mod fourcc; +extern crate fourcc; fn main() { let val = fourcc!(foo); //~ ERROR non-literal in fourcc! diff --git a/src/test/compile-fail/syntax-extension-fourcc-unsupported-literal.rs b/src/test/compile-fail/syntax-extension-fourcc-unsupported-literal.rs index 48c6d218df4..1997b7ad8e7 100644 --- a/src/test/compile-fail/syntax-extension-fourcc-unsupported-literal.rs +++ b/src/test/compile-fail/syntax-extension-fourcc-unsupported-literal.rs @@ -15,7 +15,7 @@ #[feature(phase)]; #[phase(syntax)] -extern mod fourcc; +extern crate fourcc; fn main() { let val = fourcc!(45f32); //~ ERROR unsupported literal in fourcc! diff --git a/src/test/compile-fail/unresolved-extern-mod-suggestion.rs b/src/test/compile-fail/unresolved-extern-mod-suggestion.rs index f2b1203511c..a39ffa64dfd 100644 --- a/src/test/compile-fail/unresolved-extern-mod-suggestion.rs +++ b/src/test/compile-fail/unresolved-extern-mod-suggestion.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod extra; +extern crate extra; use extra; //~ ERROR unresolved import (maybe you meant `extra::*`?) fn main() {} diff --git a/src/test/compile-fail/unresolved-import.rs b/src/test/compile-fail/unresolved-import.rs index fc69c34c118..cb009163697 100644 --- a/src/test/compile-fail/unresolved-import.rs +++ b/src/test/compile-fail/unresolved-import.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use foo::bar; //~ ERROR unresolved import. maybe a missing `extern mod foo`? +use foo::bar; //~ ERROR unresolved import. maybe a missing `extern crate foo`? //~^ ERROR failed to resolve import `foo::bar` use x = bar::baz; //~ ERROR unresolved import: there is no `baz` in `bar` //~^ ERROR failed to resolve import `bar::baz` diff --git a/src/test/compile-fail/use-from-trait-xc.rs b/src/test/compile-fail/use-from-trait-xc.rs index a4db5457750..d45387ed1a2 100644 --- a/src/test/compile-fail/use-from-trait-xc.rs +++ b/src/test/compile-fail/use-from-trait-xc.rs @@ -10,7 +10,7 @@ // aux-build:use_from_trait_xc.rs -extern mod use_from_trait_xc; +extern crate use_from_trait_xc; use use_from_trait_xc::Trait::foo; //~ ERROR cannot import from a trait or type implementation //~^ ERROR failed to resolve import diff --git a/src/test/compile-fail/use-meta-mismatch.rs b/src/test/compile-fail/use-meta-mismatch.rs index dc8250d4134..0d84a59fc9e 100644 --- a/src/test/compile-fail/use-meta-mismatch.rs +++ b/src/test/compile-fail/use-meta-mismatch.rs @@ -10,6 +10,6 @@ // error-pattern:can't find crate for `extra` -extern mod extra = "fake-crate"; +extern crate extra = "fake-crate"; fn main() { } diff --git a/src/test/compile-fail/use-meta.rc b/src/test/compile-fail/use-meta.rc index 61d18a4a2f7..9cb84c5400a 100644 --- a/src/test/compile-fail/use-meta.rc +++ b/src/test/compile-fail/use-meta.rc @@ -10,4 +10,4 @@ // error-pattern:can't find crate for `std` -extern mod std = "std#bogus"; +extern crate std = "std#bogus"; diff --git a/src/test/compile-fail/view-items-at-top.rs b/src/test/compile-fail/view-items-at-top.rs index c7c96809eec..d4b25b6baeb 100644 --- a/src/test/compile-fail/view-items-at-top.rs +++ b/src/test/compile-fail/view-items-at-top.rs @@ -8,12 +8,12 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod extra; +extern crate extra; fn f() { } -use extra::net; //~ ERROR `use` and `extern mod` declarations must precede items +use extra::net; //~ ERROR `use` and `extern crate` declarations must precede items fn main() { } diff --git a/src/test/compile-fail/xc-private-method.rs b/src/test/compile-fail/xc-private-method.rs index 4d77e9d2ea4..503c8da70be 100644 --- a/src/test/compile-fail/xc-private-method.rs +++ b/src/test/compile-fail/xc-private-method.rs @@ -11,7 +11,7 @@ // ignore-fast // aux-build:xc_private_method_lib.rs -extern mod xc_private_method_lib; +extern crate xc_private_method_lib; fn main() { let _ = xc_private_method_lib::Struct::static_meth_struct(); diff --git a/src/test/compile-fail/xc-private-method2.rs b/src/test/compile-fail/xc-private-method2.rs index d9879fcaba8..978ec39a06e 100644 --- a/src/test/compile-fail/xc-private-method2.rs +++ b/src/test/compile-fail/xc-private-method2.rs @@ -11,7 +11,7 @@ // ignore-fast // aux-build:xc_private_method_lib.rs -extern mod xc_private_method_lib; +extern crate xc_private_method_lib; fn main() { let _ = xc_private_method_lib::Struct{ x: 10 }.meth_struct(); diff --git a/src/test/compile-fail/xcrate-private-by-default.rs b/src/test/compile-fail/xcrate-private-by-default.rs index 8dd05cd00da..70b2ea87ac1 100644 --- a/src/test/compile-fail/xcrate-private-by-default.rs +++ b/src/test/compile-fail/xcrate-private-by-default.rs @@ -10,7 +10,7 @@ // aux-build:static_priv_by_default.rs -extern mod static_priv_by_default; +extern crate static_priv_by_default; fn foo() {} diff --git a/src/test/compile-fail/xcrate-unit-struct.rs b/src/test/compile-fail/xcrate-unit-struct.rs index e71a0f05dff..cccb7e50021 100644 --- a/src/test/compile-fail/xcrate-unit-struct.rs +++ b/src/test/compile-fail/xcrate-unit-struct.rs @@ -13,7 +13,7 @@ // Make sure that when we have cross-crate unit structs we don't accidentally // make values out of cross-crate structs that aren't unit. -extern mod xcrate_unit_struct; +extern crate xcrate_unit_struct; fn main() { let _ = xcrate_unit_struct::StructWithFields; //~ ERROR: unresolved name diff --git a/src/test/pretty/raw-str-nonexpr.rs b/src/test/pretty/raw-str-nonexpr.rs index c348c1a4301..026293e7524 100644 --- a/src/test/pretty/raw-str-nonexpr.rs +++ b/src/test/pretty/raw-str-nonexpr.rs @@ -14,6 +14,6 @@ #[feature(asm)]; #[cfg = r#"just parse this"#] -extern mod blah = r##"blah"##; +extern crate blah = r##"blah"##; fn main() { unsafe { asm!(r###"blah"###); } } diff --git a/src/test/run-fail/fail-main.rs b/src/test/run-fail/fail-main.rs index f007e03041c..d51a2728d3a 100644 --- a/src/test/run-fail/fail-main.rs +++ b/src/test/run-fail/fail-main.rs @@ -9,5 +9,5 @@ // except according to those terms. // error-pattern:moop -extern mod extra; +extern crate extra; fn main() { fail!("moop"); } diff --git a/src/test/run-fail/fmt-fail.rs b/src/test/run-fail/fmt-fail.rs index 3bc9014a74c..ada9e698e65 100644 --- a/src/test/run-fail/fmt-fail.rs +++ b/src/test/run-fail/fmt-fail.rs @@ -9,6 +9,6 @@ // except according to those terms. // error-pattern:meh -extern mod extra; +extern crate extra; fn main() { let str_var: ~str = ~"meh"; fail!("{}", str_var); } diff --git a/src/test/run-fail/for-each-loop-fail.rs b/src/test/run-fail/for-each-loop-fail.rs index 3c9397fc07f..f3e8c9d298c 100644 --- a/src/test/run-fail/for-each-loop-fail.rs +++ b/src/test/run-fail/for-each-loop-fail.rs @@ -9,6 +9,6 @@ // except according to those terms. // error-pattern:moop -extern mod extra; +extern crate extra; fn main() { for _ in range(0u, 10u) { fail!("moop"); } } diff --git a/src/test/run-fail/issue-2444.rs b/src/test/run-fail/issue-2444.rs index 16f54e92923..41221b526f3 100644 --- a/src/test/run-fail/issue-2444.rs +++ b/src/test/run-fail/issue-2444.rs @@ -10,7 +10,7 @@ // error-pattern:explicit failure -extern mod sync; +extern crate sync; use sync::Arc; enum e { e(Arc) } diff --git a/src/test/run-fail/linked-failure.rs b/src/test/run-fail/linked-failure.rs index 38df85e5ce6..fb5fdffffec 100644 --- a/src/test/run-fail/linked-failure.rs +++ b/src/test/run-fail/linked-failure.rs @@ -11,7 +11,7 @@ // ignore-test linked failure // error-pattern:1 == 2 -extern mod extra; +extern crate extra; use std::comm; use std::task; diff --git a/src/test/run-fail/morestack2.rs b/src/test/run-fail/morestack2.rs index f998e0cab76..08ab065598d 100644 --- a/src/test/run-fail/morestack2.rs +++ b/src/test/run-fail/morestack2.rs @@ -16,7 +16,7 @@ // See the hack in upcall_call_shim_on_c_stack where it messes // with the stack limit. -extern mod extra; +extern crate extra; use std::libc; use std::task; diff --git a/src/test/run-fail/morestack3.rs b/src/test/run-fail/morestack3.rs index c5c563a7aac..b15be740231 100644 --- a/src/test/run-fail/morestack3.rs +++ b/src/test/run-fail/morestack3.rs @@ -13,7 +13,7 @@ // Just testing unwinding -extern mod extra; +extern crate extra; use std::task; diff --git a/src/test/run-fail/morestack4.rs b/src/test/run-fail/morestack4.rs index 297674bb266..7cd19410bfc 100644 --- a/src/test/run-fail/morestack4.rs +++ b/src/test/run-fail/morestack4.rs @@ -13,7 +13,7 @@ // Just testing unwinding -extern mod extra; +extern crate extra; use std::task; diff --git a/src/test/run-fail/native-failure.rs b/src/test/run-fail/native-failure.rs index 03e7b420c85..da00bdf5e0a 100644 --- a/src/test/run-fail/native-failure.rs +++ b/src/test/run-fail/native-failure.rs @@ -13,7 +13,7 @@ #[no_uv]; -extern mod native; +extern crate native; #[start] fn start(argc: int, argv: **u8) -> int { diff --git a/src/test/run-fail/run-unexported-tests.rs b/src/test/run-fail/run-unexported-tests.rs index 427e606147d..c25eef44683 100644 --- a/src/test/run-fail/run-unexported-tests.rs +++ b/src/test/run-fail/run-unexported-tests.rs @@ -12,7 +12,7 @@ // compile-flags:--test // check-stdout -extern mod extra; +extern crate extra; mod m { pub fn exported() { } diff --git a/src/test/run-fail/spawnfail.rs b/src/test/run-fail/spawnfail.rs index f52193b7376..01bc966e90a 100644 --- a/src/test/run-fail/spawnfail.rs +++ b/src/test/run-fail/spawnfail.rs @@ -11,7 +11,7 @@ // ignore-test linked failure // error-pattern:explicit -extern mod extra; +extern crate extra; use std::task; diff --git a/src/test/run-make/bootstrap-from-c-with-green/lib.rs b/src/test/run-make/bootstrap-from-c-with-green/lib.rs index 94119cc0278..920474ea9bd 100644 --- a/src/test/run-make/bootstrap-from-c-with-green/lib.rs +++ b/src/test/run-make/bootstrap-from-c-with-green/lib.rs @@ -12,8 +12,8 @@ #[crate_type="dylib"]; #[no_uv]; -extern mod rustuv; -extern mod green; +extern crate rustuv; +extern crate green; #[no_mangle] // this needs to get called from C pub extern "C" fn foo(argc: int, argv: **u8) -> int { diff --git a/src/test/run-make/bootstrap-from-c-with-native/lib.rs b/src/test/run-make/bootstrap-from-c-with-native/lib.rs index 2a783606d94..2bc0dbb7770 100644 --- a/src/test/run-make/bootstrap-from-c-with-native/lib.rs +++ b/src/test/run-make/bootstrap-from-c-with-native/lib.rs @@ -12,7 +12,7 @@ #[crate_type="dylib"]; #[no_uv]; -extern mod native; +extern crate native; #[no_mangle] // this needs to get called from C pub extern "C" fn foo(argc: int, argv: **u8) -> int { diff --git a/src/test/run-make/c-dynamic-dylib/bar.rs b/src/test/run-make/c-dynamic-dylib/bar.rs index fa21dfac47c..37b120decd1 100644 --- a/src/test/run-make/c-dynamic-dylib/bar.rs +++ b/src/test/run-make/c-dynamic-dylib/bar.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod foo; +extern crate foo; fn main() { foo::rsfoo(); diff --git a/src/test/run-make/c-dynamic-rlib/bar.rs b/src/test/run-make/c-dynamic-rlib/bar.rs index fa21dfac47c..37b120decd1 100644 --- a/src/test/run-make/c-dynamic-rlib/bar.rs +++ b/src/test/run-make/c-dynamic-rlib/bar.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod foo; +extern crate foo; fn main() { foo::rsfoo(); diff --git a/src/test/run-make/c-static-dylib/bar.rs b/src/test/run-make/c-static-dylib/bar.rs index fa21dfac47c..37b120decd1 100644 --- a/src/test/run-make/c-static-dylib/bar.rs +++ b/src/test/run-make/c-static-dylib/bar.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod foo; +extern crate foo; fn main() { foo::rsfoo(); diff --git a/src/test/run-make/c-static-rlib/bar.rs b/src/test/run-make/c-static-rlib/bar.rs index fa21dfac47c..37b120decd1 100644 --- a/src/test/run-make/c-static-rlib/bar.rs +++ b/src/test/run-make/c-static-rlib/bar.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod foo; +extern crate foo; fn main() { foo::rsfoo(); diff --git a/src/test/run-make/dylib-chain/m2.rs b/src/test/run-make/dylib-chain/m2.rs index 98e9a9ee950..9adeaa1a20a 100644 --- a/src/test/run-make/dylib-chain/m2.rs +++ b/src/test/run-make/dylib-chain/m2.rs @@ -9,6 +9,6 @@ // except according to those terms. #[crate_type = "dylib"]; -extern mod m1; +extern crate m1; pub fn m2() { m1::m1() } diff --git a/src/test/run-make/dylib-chain/m3.rs b/src/test/run-make/dylib-chain/m3.rs index b963a4c4f0a..0a284e52445 100644 --- a/src/test/run-make/dylib-chain/m3.rs +++ b/src/test/run-make/dylib-chain/m3.rs @@ -9,6 +9,6 @@ // except according to those terms. #[crate_type = "dylib"]; -extern mod m2; +extern crate m2; pub fn m3() { m2::m2() } diff --git a/src/test/run-make/dylib-chain/m4.rs b/src/test/run-make/dylib-chain/m4.rs index ea2975d6b6e..6c2a6685802 100644 --- a/src/test/run-make/dylib-chain/m4.rs +++ b/src/test/run-make/dylib-chain/m4.rs @@ -8,6 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod m3; +extern crate m3; fn main() { m3::m3() } diff --git a/src/test/run-make/lto-smoke/main.rs b/src/test/run-make/lto-smoke/main.rs index 61ee2481c2c..e12ac9e01dc 100644 --- a/src/test/run-make/lto-smoke/main.rs +++ b/src/test/run-make/lto-smoke/main.rs @@ -8,6 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod lib; +extern crate lib; fn main() {} diff --git a/src/test/run-make/mixing-deps/dylib.rs b/src/test/run-make/mixing-deps/dylib.rs index 9aafd086480..ae5cce02245 100644 --- a/src/test/run-make/mixing-deps/dylib.rs +++ b/src/test/run-make/mixing-deps/dylib.rs @@ -9,7 +9,7 @@ // except according to those terms. #[crate_type = "dylib"]; -extern mod both; +extern crate both; use std::cast; diff --git a/src/test/run-make/mixing-deps/prog.rs b/src/test/run-make/mixing-deps/prog.rs index 5d21c01c631..ed8675eb706 100644 --- a/src/test/run-make/mixing-deps/prog.rs +++ b/src/test/run-make/mixing-deps/prog.rs @@ -8,8 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod dylib; -extern mod both; +extern crate dylib; +extern crate both; use std::cast; diff --git a/src/test/run-make/mixing-libs/dylib.rs b/src/test/run-make/mixing-libs/dylib.rs index 8bdff1d8f08..08a972ef8e6 100644 --- a/src/test/run-make/mixing-libs/dylib.rs +++ b/src/test/run-make/mixing-libs/dylib.rs @@ -9,6 +9,6 @@ // except according to those terms. #[crate_type = "dylib"]; -extern mod rlib; +extern crate rlib; pub fn dylib() { rlib::rlib() } diff --git a/src/test/run-make/mixing-libs/prog.rs b/src/test/run-make/mixing-libs/prog.rs index 9a97ddfd1b5..5e1a4274756 100644 --- a/src/test/run-make/mixing-libs/prog.rs +++ b/src/test/run-make/mixing-libs/prog.rs @@ -8,8 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod dylib; -extern mod rlib; +extern crate dylib; +extern crate rlib; fn main() { dylib::dylib(); diff --git a/src/test/run-make/prefer-dylib/foo.rs b/src/test/run-make/prefer-dylib/foo.rs index 2c22cea09aa..858ef492ace 100644 --- a/src/test/run-make/prefer-dylib/foo.rs +++ b/src/test/run-make/prefer-dylib/foo.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod bar; +extern crate bar; fn main() { bar::bar(); diff --git a/src/test/run-make/prefer-rlib/foo.rs b/src/test/run-make/prefer-rlib/foo.rs index 2c22cea09aa..858ef492ace 100644 --- a/src/test/run-make/prefer-rlib/foo.rs +++ b/src/test/run-make/prefer-rlib/foo.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod bar; +extern crate bar; fn main() { bar::bar(); diff --git a/src/test/run-make/rlib-chain/m2.rs b/src/test/run-make/rlib-chain/m2.rs index 612e59d1082..40c1575d069 100644 --- a/src/test/run-make/rlib-chain/m2.rs +++ b/src/test/run-make/rlib-chain/m2.rs @@ -9,6 +9,6 @@ // except according to those terms. #[crate_type = "rlib"]; -extern mod m1; +extern crate m1; pub fn m2() { m1::m1() } diff --git a/src/test/run-make/rlib-chain/m3.rs b/src/test/run-make/rlib-chain/m3.rs index 7545eed6f01..3d3be554757 100644 --- a/src/test/run-make/rlib-chain/m3.rs +++ b/src/test/run-make/rlib-chain/m3.rs @@ -9,6 +9,6 @@ // except according to those terms. #[crate_type = "rlib"]; -extern mod m2; +extern crate m2; pub fn m3() { m2::m2() } diff --git a/src/test/run-make/rlib-chain/m4.rs b/src/test/run-make/rlib-chain/m4.rs index ea2975d6b6e..6c2a6685802 100644 --- a/src/test/run-make/rlib-chain/m4.rs +++ b/src/test/run-make/rlib-chain/m4.rs @@ -8,6 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod m3; +extern crate m3; fn main() { m3::m3() } diff --git a/src/test/run-make/simple-dylib/foo.rs b/src/test/run-make/simple-dylib/foo.rs index 2c22cea09aa..858ef492ace 100644 --- a/src/test/run-make/simple-dylib/foo.rs +++ b/src/test/run-make/simple-dylib/foo.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod bar; +extern crate bar; fn main() { bar::bar(); diff --git a/src/test/run-make/simple-rlib/foo.rs b/src/test/run-make/simple-rlib/foo.rs index 2c22cea09aa..858ef492ace 100644 --- a/src/test/run-make/simple-rlib/foo.rs +++ b/src/test/run-make/simple-rlib/foo.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod bar; +extern crate bar; fn main() { bar::bar(); diff --git a/src/test/run-make/static-unwinding/main.rs b/src/test/run-make/static-unwinding/main.rs index c47d2058393..08777490f21 100644 --- a/src/test/run-make/static-unwinding/main.rs +++ b/src/test/run-make/static-unwinding/main.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod lib; +extern crate lib; use std::task; diff --git a/src/test/run-pass-fulldeps/macro-crate-outlive-expansion-phase.rs b/src/test/run-pass-fulldeps/macro-crate-outlive-expansion-phase.rs index a71cc465e88..80ebf54559f 100644 --- a/src/test/run-pass-fulldeps/macro-crate-outlive-expansion-phase.rs +++ b/src/test/run-pass-fulldeps/macro-crate-outlive-expansion-phase.rs @@ -16,6 +16,6 @@ #[feature(phase)]; #[phase(syntax)] -extern mod macro_crate_outlive_expansion_phase; +extern crate macro_crate_outlive_expansion_phase; pub fn main() {} diff --git a/src/test/run-pass-fulldeps/macro-crate.rs b/src/test/run-pass-fulldeps/macro-crate.rs index b9077ab59d7..6738bd245e3 100644 --- a/src/test/run-pass-fulldeps/macro-crate.rs +++ b/src/test/run-pass-fulldeps/macro-crate.rs @@ -16,7 +16,7 @@ #[feature(phase)]; #[phase(syntax)] -extern mod macro_crate_test; +extern crate macro_crate_test; pub fn main() { assert_eq!(1, make_a_1!()); diff --git a/src/test/run-pass-fulldeps/qquote.rs b/src/test/run-pass-fulldeps/qquote.rs index 662ecfb46d3..0e31cbd2e95 100644 --- a/src/test/run-pass-fulldeps/qquote.rs +++ b/src/test/run-pass-fulldeps/qquote.rs @@ -13,8 +13,8 @@ #[feature(quote)]; -extern mod extra; -extern mod syntax; +extern crate extra; +extern crate syntax; use std::io::*; diff --git a/src/test/run-pass-fulldeps/quote-tokens.rs b/src/test/run-pass-fulldeps/quote-tokens.rs index 114e62fb80a..b11515ac24b 100644 --- a/src/test/run-pass-fulldeps/quote-tokens.rs +++ b/src/test/run-pass-fulldeps/quote-tokens.rs @@ -13,7 +13,7 @@ #[feature(quote)]; #[feature(managed_boxes)]; -extern mod syntax; +extern crate syntax; use syntax::ext::base::ExtCtxt; diff --git a/src/test/run-pass-fulldeps/quote-unused-sp-no-warning.rs b/src/test/run-pass-fulldeps/quote-unused-sp-no-warning.rs index a27b4e30238..ac8d361bf5a 100644 --- a/src/test/run-pass-fulldeps/quote-unused-sp-no-warning.rs +++ b/src/test/run-pass-fulldeps/quote-unused-sp-no-warning.rs @@ -13,7 +13,7 @@ #[feature(quote)]; #[deny(unused_variable)]; -extern mod syntax; +extern crate syntax; use syntax::ext::base::ExtCtxt; diff --git a/src/test/run-pass-fulldeps/syntax-extension-fourcc.rs b/src/test/run-pass-fulldeps/syntax-extension-fourcc.rs index ab25946b643..a6f118d77fa 100644 --- a/src/test/run-pass-fulldeps/syntax-extension-fourcc.rs +++ b/src/test/run-pass-fulldeps/syntax-extension-fourcc.rs @@ -16,7 +16,7 @@ #[feature(phase)]; #[phase(syntax)] -extern mod fourcc; +extern crate fourcc; static static_val: u32 = fourcc!("foo "); static static_val_be: u32 = fourcc!("foo ", big); diff --git a/src/test/run-pass/anon-extern-mod-cross-crate-2.rs b/src/test/run-pass/anon-extern-mod-cross-crate-2.rs index 7187438cc6d..8cadf4825f6 100644 --- a/src/test/run-pass/anon-extern-mod-cross-crate-2.rs +++ b/src/test/run-pass/anon-extern-mod-cross-crate-2.rs @@ -11,7 +11,7 @@ // ignore-fast // ignore-pretty // aux-build:anon-extern-mod-cross-crate-1.rs -extern mod anonexternmod; +extern crate anonexternmod; use anonexternmod::rust_get_test_int; diff --git a/src/test/run-pass/anon_trait_static_method_exe.rs b/src/test/run-pass/anon_trait_static_method_exe.rs index c7b35c7f366..c66a8a9d2ca 100644 --- a/src/test/run-pass/anon_trait_static_method_exe.rs +++ b/src/test/run-pass/anon_trait_static_method_exe.rs @@ -11,7 +11,7 @@ // ignore-fast - check-fast doesn't understand aux-build // aux-build:anon_trait_static_method_lib.rs -extern mod anon_trait_static_method_lib; +extern crate anon_trait_static_method_lib; use anon_trait_static_method_lib::Foo; pub fn main() { diff --git a/src/test/run-pass/attr-before-view-item.rs b/src/test/run-pass/attr-before-view-item.rs index 316f8fa0f61..30d4315f081 100644 --- a/src/test/run-pass/attr-before-view-item.rs +++ b/src/test/run-pass/attr-before-view-item.rs @@ -11,7 +11,7 @@ // error-pattern:expected item #[foo = "bar"] -extern mod extra; +extern crate extra; pub fn main() { } diff --git a/src/test/run-pass/attr-before-view-item2.rs b/src/test/run-pass/attr-before-view-item2.rs index 0721544aa0d..0d099841c0b 100644 --- a/src/test/run-pass/attr-before-view-item2.rs +++ b/src/test/run-pass/attr-before-view-item2.rs @@ -12,7 +12,7 @@ mod m { #[foo = "bar"] - extern mod extra; + extern crate extra; } pub fn main() { diff --git a/src/test/run-pass/auto-encode.rs b/src/test/run-pass/auto-encode.rs index 6c511bcdaf0..caf9a92bba3 100644 --- a/src/test/run-pass/auto-encode.rs +++ b/src/test/run-pass/auto-encode.rs @@ -13,7 +13,7 @@ #[feature(managed_boxes)]; -extern mod extra; +extern crate extra; // These tests used to be separate files, but I wanted to refactor all // the common code. diff --git a/src/test/run-pass/bind-by-move.rs b/src/test/run-pass/bind-by-move.rs index 698b7b43d08..e8cbd037434 100644 --- a/src/test/run-pass/bind-by-move.rs +++ b/src/test/run-pass/bind-by-move.rs @@ -9,7 +9,7 @@ // except according to those terms. // ignore-fast -extern mod sync; +extern crate sync; use sync::Arc; fn dispose(_x: Arc) { } diff --git a/src/test/run-pass/bitv-perf-test.rs b/src/test/run-pass/bitv-perf-test.rs index 6525e879750..20b3ca0b3ba 100644 --- a/src/test/run-pass/bitv-perf-test.rs +++ b/src/test/run-pass/bitv-perf-test.rs @@ -10,7 +10,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod collections; +extern crate collections; use collections::Bitv; fn bitv_test() { diff --git a/src/test/run-pass/block-arg-call-as.rs b/src/test/run-pass/block-arg-call-as.rs index 5d5a5843a64..c149afb8782 100644 --- a/src/test/run-pass/block-arg-call-as.rs +++ b/src/test/run-pass/block-arg-call-as.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod extra; +extern crate extra; fn asSendfn(f: proc() -> uint) -> uint { return f(); diff --git a/src/test/run-pass/builtin-superkinds-capabilities-xc.rs b/src/test/run-pass/builtin-superkinds-capabilities-xc.rs index ce633b118bb..b67edf245b2 100644 --- a/src/test/run-pass/builtin-superkinds-capabilities-xc.rs +++ b/src/test/run-pass/builtin-superkinds-capabilities-xc.rs @@ -15,7 +15,7 @@ // Tests "capabilities" granted by traits with super-builtin-kinds, // even when using them cross-crate. -extern mod trait_superkinds_in_metadata; +extern crate trait_superkinds_in_metadata; use trait_superkinds_in_metadata::{RequiresRequiresFreezeAndSend, RequiresFreeze}; #[deriving(Eq)] diff --git a/src/test/run-pass/builtin-superkinds-in-metadata.rs b/src/test/run-pass/builtin-superkinds-in-metadata.rs index eeb4d7f6dd5..8cecd5019a3 100644 --- a/src/test/run-pass/builtin-superkinds-in-metadata.rs +++ b/src/test/run-pass/builtin-superkinds-in-metadata.rs @@ -14,7 +14,7 @@ // Tests (correct) usage of trait super-builtin-kinds cross-crate. -extern mod trait_superkinds_in_metadata; +extern crate trait_superkinds_in_metadata; use trait_superkinds_in_metadata::{RequiresRequiresFreezeAndSend, RequiresFreeze}; use trait_superkinds_in_metadata::{RequiresPod}; diff --git a/src/test/run-pass/capturing-logging.rs b/src/test/run-pass/capturing-logging.rs index 37557d0ab7d..2473911483c 100644 --- a/src/test/run-pass/capturing-logging.rs +++ b/src/test/run-pass/capturing-logging.rs @@ -13,7 +13,7 @@ // exec-env:RUST_LOG=info #[no_uv]; -extern mod native; +extern crate native; use std::fmt; use std::io::{PortReader, ChanWriter}; diff --git a/src/test/run-pass/cci_borrow.rs b/src/test/run-pass/cci_borrow.rs index c7e3de71fe2..cb77c63d451 100644 --- a/src/test/run-pass/cci_borrow.rs +++ b/src/test/run-pass/cci_borrow.rs @@ -13,7 +13,7 @@ #[feature(managed_boxes)]; -extern mod cci_borrow_lib; +extern crate cci_borrow_lib; use cci_borrow_lib::foo; pub fn main() { diff --git a/src/test/run-pass/cci_capture_clause.rs b/src/test/run-pass/cci_capture_clause.rs index f72f06e2a7b..fa96f65243e 100644 --- a/src/test/run-pass/cci_capture_clause.rs +++ b/src/test/run-pass/cci_capture_clause.rs @@ -14,7 +14,7 @@ // This test makes sure we can do cross-crate inlining on functions // that use capture clauses. -extern mod cci_capture_clause; +extern crate cci_capture_clause; pub fn main() { cci_capture_clause::foo(()).recv() diff --git a/src/test/run-pass/cci_impl_exe.rs b/src/test/run-pass/cci_impl_exe.rs index f297b54c54d..e5e1736044c 100644 --- a/src/test/run-pass/cci_impl_exe.rs +++ b/src/test/run-pass/cci_impl_exe.rs @@ -11,7 +11,7 @@ // ignore-fast - check-fast doesn't understand aux-build // aux-build:cci_impl_lib.rs -extern mod cci_impl_lib; +extern crate cci_impl_lib; use cci_impl_lib::uint_helpers; pub fn main() { diff --git a/src/test/run-pass/cci_iter_exe.rs b/src/test/run-pass/cci_iter_exe.rs index ce9687e6b9a..41717177f75 100644 --- a/src/test/run-pass/cci_iter_exe.rs +++ b/src/test/run-pass/cci_iter_exe.rs @@ -11,7 +11,7 @@ // ignore-fast - check-fast doesn't understand aux-build // aux-build:cci_iter_lib.rs -extern mod cci_iter_lib; +extern crate cci_iter_lib; pub fn main() { //let bt0 = sys::rusti::frame_address(1u32); diff --git a/src/test/run-pass/cci_nested_exe.rs b/src/test/run-pass/cci_nested_exe.rs index f5f00e4c279..3810f7919ac 100644 --- a/src/test/run-pass/cci_nested_exe.rs +++ b/src/test/run-pass/cci_nested_exe.rs @@ -13,7 +13,7 @@ #[feature(globs, managed_boxes)]; -extern mod cci_nested_lib; +extern crate cci_nested_lib; use cci_nested_lib::*; pub fn main() { diff --git a/src/test/run-pass/cci_no_inline_exe.rs b/src/test/run-pass/cci_no_inline_exe.rs index d0e97b98351..faa2a350117 100644 --- a/src/test/run-pass/cci_no_inline_exe.rs +++ b/src/test/run-pass/cci_no_inline_exe.rs @@ -11,7 +11,7 @@ // ignore-fast - check-fast doesn't understand aux-build // aux-build:cci_no_inline_lib.rs -extern mod cci_no_inline_lib; +extern crate cci_no_inline_lib; use cci_no_inline_lib::iter; pub fn main() { diff --git a/src/test/run-pass/cfg_inner_static.rs b/src/test/run-pass/cfg_inner_static.rs index 977d8a2b0a7..08951dfd50e 100644 --- a/src/test/run-pass/cfg_inner_static.rs +++ b/src/test/run-pass/cfg_inner_static.rs @@ -11,7 +11,7 @@ // aux-build:cfg_inner_static.rs // ignore-fast -extern mod cfg_inner_static; +extern crate cfg_inner_static; pub fn main() { cfg_inner_static::foo(); diff --git a/src/test/run-pass/class-cast-to-trait-cross-crate-2.rs b/src/test/run-pass/class-cast-to-trait-cross-crate-2.rs index d9fa5507cf1..746342ae973 100644 --- a/src/test/run-pass/class-cast-to-trait-cross-crate-2.rs +++ b/src/test/run-pass/class-cast-to-trait-cross-crate-2.rs @@ -10,7 +10,7 @@ // ignore-fast // aux-build:cci_class_cast.rs -extern mod cci_class_cast; +extern crate cci_class_cast; use std::to_str::ToStr; use cci_class_cast::kitty::cat; diff --git a/src/test/run-pass/class-implement-trait-cross-crate.rs b/src/test/run-pass/class-implement-trait-cross-crate.rs index 908c3afda12..caa4a3b2feb 100644 --- a/src/test/run-pass/class-implement-trait-cross-crate.rs +++ b/src/test/run-pass/class-implement-trait-cross-crate.rs @@ -10,7 +10,7 @@ // ignore-fast // aux-build:cci_class_trait.rs -extern mod cci_class_trait; +extern crate cci_class_trait; use cci_class_trait::animals::noisy; struct cat { diff --git a/src/test/run-pass/class-method-cross-crate.rs b/src/test/run-pass/class-method-cross-crate.rs index 41143d7ade6..8ee367d281f 100644 --- a/src/test/run-pass/class-method-cross-crate.rs +++ b/src/test/run-pass/class-method-cross-crate.rs @@ -10,7 +10,7 @@ // ignore-fast // aux-build:cci_class_2.rs -extern mod cci_class_2; +extern crate cci_class_2; use cci_class_2::kitties::cat; pub fn main() { diff --git a/src/test/run-pass/class-methods-cross-crate.rs b/src/test/run-pass/class-methods-cross-crate.rs index 2975843ae57..ca3b491844f 100644 --- a/src/test/run-pass/class-methods-cross-crate.rs +++ b/src/test/run-pass/class-methods-cross-crate.rs @@ -10,7 +10,7 @@ // ignore-fast // aux-build:cci_class_3.rs -extern mod cci_class_3; +extern crate cci_class_3; use cci_class_3::kitties::cat; pub fn main() { diff --git a/src/test/run-pass/class-poly-methods-cross-crate.rs b/src/test/run-pass/class-poly-methods-cross-crate.rs index bc9e73b3565..671d7a40353 100644 --- a/src/test/run-pass/class-poly-methods-cross-crate.rs +++ b/src/test/run-pass/class-poly-methods-cross-crate.rs @@ -10,7 +10,7 @@ // ignore-fast // aux-build:cci_class_6.rs -extern mod cci_class_6; +extern crate cci_class_6; use cci_class_6::kitties::cat; pub fn main() { diff --git a/src/test/run-pass/classes-cross-crate.rs b/src/test/run-pass/classes-cross-crate.rs index 8c7e0e3febb..2e1d19b9dda 100644 --- a/src/test/run-pass/classes-cross-crate.rs +++ b/src/test/run-pass/classes-cross-crate.rs @@ -10,7 +10,7 @@ // ignore-fast // aux-build:cci_class_4.rs -extern mod cci_class_4; +extern crate cci_class_4; use cci_class_4::kitties::cat; pub fn main() { diff --git a/src/test/run-pass/classes-simple-cross-crate.rs b/src/test/run-pass/classes-simple-cross-crate.rs index 8546f79c1e8..6d816e725b9 100644 --- a/src/test/run-pass/classes-simple-cross-crate.rs +++ b/src/test/run-pass/classes-simple-cross-crate.rs @@ -10,7 +10,7 @@ // ignore-fast // aux-build:cci_class.rs -extern mod cci_class; +extern crate cci_class; use cci_class::kitties::cat; pub fn main() { diff --git a/src/test/run-pass/clone-with-exterior.rs b/src/test/run-pass/clone-with-exterior.rs index 6fab709543a..091cebcc063 100644 --- a/src/test/run-pass/clone-with-exterior.rs +++ b/src/test/run-pass/clone-with-exterior.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod extra; +extern crate extra; use std::task::spawn; struct Pair { diff --git a/src/test/run-pass/const-cross-crate-const.rs b/src/test/run-pass/const-cross-crate-const.rs index 4f8db9a3ca2..c8dc98baac6 100644 --- a/src/test/run-pass/const-cross-crate-const.rs +++ b/src/test/run-pass/const-cross-crate-const.rs @@ -11,7 +11,7 @@ // ignore-fast // aux-build:cci_const.rs -extern mod cci_const; +extern crate cci_const; static foo: &'static str = cci_const::foopy; static a: uint = cci_const::uint_val; static b: uint = cci_const::uint_expr + 5; diff --git a/src/test/run-pass/const-cross-crate-extern.rs b/src/test/run-pass/const-cross-crate-extern.rs index 22d2c908b37..75a0bac0293 100644 --- a/src/test/run-pass/const-cross-crate-extern.rs +++ b/src/test/run-pass/const-cross-crate-extern.rs @@ -11,7 +11,7 @@ // ignore-fast // aux-build:cci_const.rs -extern mod cci_const; +extern crate cci_const; use cci_const::bar; static foo: extern "C" fn() = bar; diff --git a/src/test/run-pass/crate-method-reexport-grrrrrrr.rs b/src/test/run-pass/crate-method-reexport-grrrrrrr.rs index 0993105c512..1b563d33433 100644 --- a/src/test/run-pass/crate-method-reexport-grrrrrrr.rs +++ b/src/test/run-pass/crate-method-reexport-grrrrrrr.rs @@ -17,7 +17,7 @@ // ignore-fast // aux-build:crate-method-reexport-grrrrrrr2.rs -extern mod crate_method_reexport_grrrrrrr2; +extern crate crate_method_reexport_grrrrrrr2; pub fn main() { use crate_method_reexport_grrrrrrr2::rust::add; diff --git a/src/test/run-pass/crateresolve1.rs b/src/test/run-pass/crateresolve1.rs index dec983a180f..bf13e66690c 100644 --- a/src/test/run-pass/crateresolve1.rs +++ b/src/test/run-pass/crateresolve1.rs @@ -13,7 +13,7 @@ // aux-build:crateresolve1-2.rs // aux-build:crateresolve1-3.rs -extern mod crateresolve1 = "crateresolve1#0.2"; +extern crate crateresolve1 = "crateresolve1#0.2"; pub fn main() { assert_eq!(crateresolve1::f(), 20); diff --git a/src/test/run-pass/crateresolve2.rs b/src/test/run-pass/crateresolve2.rs index 97bcd56178f..1419d68ad68 100644 --- a/src/test/run-pass/crateresolve2.rs +++ b/src/test/run-pass/crateresolve2.rs @@ -14,17 +14,17 @@ // aux-build:crateresolve2-3.rs mod a { - extern mod crateresolve2 = "crateresolve2#0.1"; + extern crate crateresolve2 = "crateresolve2#0.1"; pub fn f() { assert!(crateresolve2::f() == 10); } } mod b { - extern mod crateresolve2 = "crateresolve2#0.2"; + extern crate crateresolve2 = "crateresolve2#0.2"; pub fn f() { assert!(crateresolve2::f() == 20); } } mod c { - extern mod crateresolve2 = "crateresolve2#0.3"; + extern crate crateresolve2 = "crateresolve2#0.3"; pub fn f() { assert!(crateresolve2::f() == 30); } } diff --git a/src/test/run-pass/crateresolve3.rs b/src/test/run-pass/crateresolve3.rs index 4f87b9bb02f..fd83c8f515a 100644 --- a/src/test/run-pass/crateresolve3.rs +++ b/src/test/run-pass/crateresolve3.rs @@ -16,12 +16,12 @@ // as long as no name collision on invoked functions. mod a { - extern mod crateresolve3 = "crateresolve3#0.1"; + extern crate crateresolve3 = "crateresolve3#0.1"; pub fn f() { assert!(crateresolve3::f() == 10); } } mod b { - extern mod crateresolve3 = "crateresolve3#0.2"; + extern crate crateresolve3 = "crateresolve3#0.2"; pub fn f() { assert!(crateresolve3::g() == 20); } } diff --git a/src/test/run-pass/crateresolve4.rs b/src/test/run-pass/crateresolve4.rs index 3e2d19f2a8d..3243c909e03 100644 --- a/src/test/run-pass/crateresolve4.rs +++ b/src/test/run-pass/crateresolve4.rs @@ -15,12 +15,12 @@ // aux-build:crateresolve4b-2.rs pub mod a { - extern mod crateresolve4b = "crateresolve4b#0.1"; + extern crate crateresolve4b = "crateresolve4b#0.1"; pub fn f() { assert!(crateresolve4b::f() == 20); } } pub mod b { - extern mod crateresolve4b = "crateresolve4b#0.2"; + extern crate crateresolve4b = "crateresolve4b#0.2"; pub fn f() { assert!(crateresolve4b::g() == 10); } } diff --git a/src/test/run-pass/crateresolve5.rs b/src/test/run-pass/crateresolve5.rs index 24a9f2286b4..ca690b9089b 100644 --- a/src/test/run-pass/crateresolve5.rs +++ b/src/test/run-pass/crateresolve5.rs @@ -12,8 +12,8 @@ // aux-build:crateresolve5-1.rs // aux-build:crateresolve5-2.rs -extern mod cr5_1 = "crateresolve5#0.1"; -extern mod cr5_2 = "crateresolve5#0.2"; +extern crate cr5_1 = "crateresolve5#0.1"; +extern crate cr5_2 = "crateresolve5#0.2"; pub fn main() { // Structural types can be used between two versions of the same crate diff --git a/src/test/run-pass/crateresolve8.rs b/src/test/run-pass/crateresolve8.rs index 4d1cba92f80..46ccb01f660 100644 --- a/src/test/run-pass/crateresolve8.rs +++ b/src/test/run-pass/crateresolve8.rs @@ -13,8 +13,8 @@ #[crate_id="crateresolve8#0.1"]; -extern mod crateresolve8 = "crateresolve8#0.1"; -//extern mod crateresolve8(vers = "0.1"); +extern crate crateresolve8 = "crateresolve8#0.1"; +//extern crate crateresolve8(vers = "0.1"); pub fn main() { assert_eq!(crateresolve8::f(), 20); diff --git a/src/test/run-pass/cross-crate-const-pat.rs b/src/test/run-pass/cross-crate-const-pat.rs index 1949c07ce59..9e3a43469f2 100644 --- a/src/test/run-pass/cross-crate-const-pat.rs +++ b/src/test/run-pass/cross-crate-const-pat.rs @@ -11,7 +11,7 @@ // ignore-fast // aux-build:cci_const.rs -extern mod cci_const; +extern crate cci_const; pub fn main() { let x = cci_const::uint_val; diff --git a/src/test/run-pass/cross-crate-newtype-struct-pat.rs b/src/test/run-pass/cross-crate-newtype-struct-pat.rs index ddebd5da114..8988ee52b16 100644 --- a/src/test/run-pass/cross-crate-newtype-struct-pat.rs +++ b/src/test/run-pass/cross-crate-newtype-struct-pat.rs @@ -11,7 +11,7 @@ // ignore-fast // aux-build:newtype_struct_xc.rs -extern mod newtype_struct_xc; +extern crate newtype_struct_xc; pub fn main() { let x = newtype_struct_xc::Au(21); diff --git a/src/test/run-pass/deriving-encodable-decodable.rs b/src/test/run-pass/deriving-encodable-decodable.rs index 177459c0321..50ccac793c2 100644 --- a/src/test/run-pass/deriving-encodable-decodable.rs +++ b/src/test/run-pass/deriving-encodable-decodable.rs @@ -16,7 +16,7 @@ #[feature(struct_variant, managed_boxes)]; -extern mod serialize; +extern crate serialize; use std::io::MemWriter; use std::rand::{random, Rand}; diff --git a/src/test/run-pass/deriving-global.rs b/src/test/run-pass/deriving-global.rs index ca53636b0a6..544a8c2b00a 100644 --- a/src/test/run-pass/deriving-global.rs +++ b/src/test/run-pass/deriving-global.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-fast #7103 `extern mod` does not work on check-fast +// ignore-fast #7103 `extern crate` does not work on check-fast // ignore-pretty - does not converge // Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT @@ -21,7 +21,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod serialize; // {En,De}codable +extern crate serialize; // {En,De}codable mod submod { // if any of these are implemented without global calls for any // function calls, then being in a submodule will (correctly) diff --git a/src/test/run-pass/duplicate-use.rs b/src/test/run-pass/duplicate-use.rs index 4362792ceeb..c710eb5eafb 100644 --- a/src/test/run-pass/duplicate-use.rs +++ b/src/test/run-pass/duplicate-use.rs @@ -10,7 +10,7 @@ // ignore-test -extern mod extra; +extern crate extra; use list = extra::oldmap::chained; use extra::list; diff --git a/src/test/run-pass/duplicated-external-mods.rs b/src/test/run-pass/duplicated-external-mods.rs index 0a975e3f89d..b50fd7cbb34 100644 --- a/src/test/run-pass/duplicated-external-mods.rs +++ b/src/test/run-pass/duplicated-external-mods.rs @@ -11,7 +11,7 @@ // ignore-fast // aux-build:anon-extern-mod-cross-crate-1.rs // aux-build:anon-extern-mod-cross-crate-1.rs -extern mod anonexternmod; +extern crate anonexternmod; pub fn main() { } diff --git a/src/test/run-pass/explicit-self-generic.rs b/src/test/run-pass/explicit-self-generic.rs index fb533a3de58..a3c5256c2d3 100644 --- a/src/test/run-pass/explicit-self-generic.rs +++ b/src/test/run-pass/explicit-self-generic.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod extra; +extern crate extra; /** * A function that returns a hash of a value diff --git a/src/test/run-pass/explicit_self_xcrate_exe.rs b/src/test/run-pass/explicit_self_xcrate_exe.rs index dc00bce141c..ce805fcf737 100644 --- a/src/test/run-pass/explicit_self_xcrate_exe.rs +++ b/src/test/run-pass/explicit_self_xcrate_exe.rs @@ -11,7 +11,7 @@ // ignore-fast // aux-build:explicit_self_xcrate.rs -extern mod explicit_self_xcrate; +extern crate explicit_self_xcrate; use explicit_self_xcrate::{Foo, Bar}; pub fn main() { diff --git a/src/test/run-pass/extern-calling-convention-test.rs b/src/test/run-pass/extern-calling-convention-test.rs index 92726f9a2a8..b895466cf7e 100644 --- a/src/test/run-pass/extern-calling-convention-test.rs +++ b/src/test/run-pass/extern-calling-convention-test.rs @@ -11,7 +11,7 @@ // ignore-fast: aux-build not compatible with fast // aux-build:extern_calling_convention.rs -extern mod extern_calling_convention; +extern crate extern_calling_convention; use extern_calling_convention::foo; diff --git a/src/test/run-pass/extern-crosscrate.rs b/src/test/run-pass/extern-crosscrate.rs index 30ea3bc260c..ccd79600a15 100644 --- a/src/test/run-pass/extern-crosscrate.rs +++ b/src/test/run-pass/extern-crosscrate.rs @@ -11,7 +11,7 @@ // ignore-fast //aux-build:extern-crosscrate-source.rs -extern mod externcallback = "externcallback#0.1"; +extern crate externcallback = "externcallback#0.1"; fn fact(n: uint) -> uint { unsafe { diff --git a/src/test/run-pass/extern-foreign-crate.rs b/src/test/run-pass/extern-foreign-crate.rs index 8949734b80e..1c5df4acf73 100644 --- a/src/test/run-pass/extern-foreign-crate.rs +++ b/src/test/run-pass/extern-foreign-crate.rs @@ -9,6 +9,6 @@ // except according to those terms. extern crate extra; -extern mod mystd = "std"; +extern crate mystd = "std"; pub fn main() {} diff --git a/src/test/run-pass/extern-mod-ordering-exe.rs b/src/test/run-pass/extern-mod-ordering-exe.rs index 87c53f5ff57..f228c0c0992 100644 --- a/src/test/run-pass/extern-mod-ordering-exe.rs +++ b/src/test/run-pass/extern-mod-ordering-exe.rs @@ -11,7 +11,7 @@ // aux-build:extern_mod_ordering_lib.rs // ignore-fast -extern mod extern_mod_ordering_lib; +extern crate extern_mod_ordering_lib; use extern_mod_ordering_lib::extern_mod_ordering_lib; diff --git a/src/test/run-pass/extern-mod-syntax.rs b/src/test/run-pass/extern-mod-syntax.rs index ff798991c87..fdea2716d5f 100644 --- a/src/test/run-pass/extern-mod-syntax.rs +++ b/src/test/run-pass/extern-mod-syntax.rs @@ -12,7 +12,7 @@ #[allow(unused_imports)]; -extern mod extra; +extern crate extra; use extra::json::Object; pub fn main() { diff --git a/src/test/run-pass/float-nan.rs b/src/test/run-pass/float-nan.rs index 9035176a267..66c84d52745 100644 --- a/src/test/run-pass/float-nan.rs +++ b/src/test/run-pass/float-nan.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod extra; +extern crate extra; use std::num::Float; diff --git a/src/test/run-pass/foreign-fn-linkname.rs b/src/test/run-pass/foreign-fn-linkname.rs index aeba5c0ec97..b9d8d622731 100644 --- a/src/test/run-pass/foreign-fn-linkname.rs +++ b/src/test/run-pass/foreign-fn-linkname.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod extra; +extern crate extra; mod libc { use std::libc::{c_char, size_t}; diff --git a/src/test/run-pass/generic-default-type-params-cross-crate.rs b/src/test/run-pass/generic-default-type-params-cross-crate.rs index 2fc6570f77d..412e780f8a2 100644 --- a/src/test/run-pass/generic-default-type-params-cross-crate.rs +++ b/src/test/run-pass/generic-default-type-params-cross-crate.rs @@ -15,7 +15,7 @@ #[allow(default_type_param_usage)]; -extern mod default_type_params_xc; +extern crate default_type_params_xc; struct Vec; diff --git a/src/test/run-pass/getopts_ref.rs b/src/test/run-pass/getopts_ref.rs index d62050e0f86..55ecf919b72 100644 --- a/src/test/run-pass/getopts_ref.rs +++ b/src/test/run-pass/getopts_ref.rs @@ -10,7 +10,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod getopts; +extern crate getopts; use getopts::{optopt, getopts}; diff --git a/src/test/run-pass/glob-std.rs b/src/test/run-pass/glob-std.rs index 4d889b7f00d..c1e6f04e67d 100644 --- a/src/test/run-pass/glob-std.rs +++ b/src/test/run-pass/glob-std.rs @@ -8,11 +8,11 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-fast check-fast doesn't like 'extern mod extra' +// ignore-fast check-fast doesn't like 'extern crate extra' // ignore-win32 TempDir may cause IoError on windows: #10462 -extern mod extra; -extern mod glob; +extern crate extra; +extern crate glob; use glob::glob; use extra::tempfile::TempDir; diff --git a/src/test/run-pass/impl-privacy-xc-1.rs b/src/test/run-pass/impl-privacy-xc-1.rs index efdc9e8655c..9665d4d684d 100644 --- a/src/test/run-pass/impl-privacy-xc-1.rs +++ b/src/test/run-pass/impl-privacy-xc-1.rs @@ -11,7 +11,7 @@ // aux-build:impl_privacy_xc_1.rs // ignore-fast -extern mod impl_privacy_xc_1; +extern crate impl_privacy_xc_1; pub fn main() { let fish = impl_privacy_xc_1::Fish { x: 1 }; diff --git a/src/test/run-pass/impl-privacy-xc-2.rs b/src/test/run-pass/impl-privacy-xc-2.rs index 829c7eb5f29..8e67a5c74c5 100644 --- a/src/test/run-pass/impl-privacy-xc-2.rs +++ b/src/test/run-pass/impl-privacy-xc-2.rs @@ -11,7 +11,7 @@ // aux-build:impl_privacy_xc_2.rs // ignore-fast -extern mod impl_privacy_xc_2; +extern crate impl_privacy_xc_2; pub fn main() { let fish1 = impl_privacy_xc_2::Fish { x: 1 }; diff --git a/src/test/run-pass/import-glob-crate.rs b/src/test/run-pass/import-glob-crate.rs index 1815497d205..f2117efb0bb 100644 --- a/src/test/run-pass/import-glob-crate.rs +++ b/src/test/run-pass/import-glob-crate.rs @@ -13,7 +13,7 @@ #[feature(globs)]; #[allow(dead_assignment)]; -extern mod extra; +extern crate extra; use std::vec::*; pub fn main() { diff --git a/src/test/run-pass/infinite-loops.rs b/src/test/run-pass/infinite-loops.rs index ff3937784b8..50091c94a76 100644 --- a/src/test/run-pass/infinite-loops.rs +++ b/src/test/run-pass/infinite-loops.rs @@ -14,7 +14,7 @@ */ // ignore-test -extern mod extra; +extern crate extra; fn loopy(n: int) { if n > 0 { spawn(proc() { loopy(n - 1) }); spawn(proc() { loopy(n - 1) }); } diff --git a/src/test/run-pass/inner-static.rs b/src/test/run-pass/inner-static.rs index ec5fea3b6ed..3e04a8a3922 100644 --- a/src/test/run-pass/inner-static.rs +++ b/src/test/run-pass/inner-static.rs @@ -11,7 +11,7 @@ // aux-build:inner_static.rs // ignore-fast -extern mod inner_static; +extern crate inner_static; pub fn main() { let a = inner_static::A::<()>; diff --git a/src/test/run-pass/intrinsic-atomics-cc.rs b/src/test/run-pass/intrinsic-atomics-cc.rs index 9554ed20e05..7fda83a14bb 100644 --- a/src/test/run-pass/intrinsic-atomics-cc.rs +++ b/src/test/run-pass/intrinsic-atomics-cc.rs @@ -11,7 +11,7 @@ // ignore-fast - check-fast doesn't understand aux-build // aux-build:cci_intrinsic.rs -extern mod cci_intrinsic; +extern crate cci_intrinsic; use cci_intrinsic::atomic_xchg; pub fn main() { diff --git a/src/test/run-pass/intrinsics-integer.rs b/src/test/run-pass/intrinsics-integer.rs index 0a805ecc382..9c62f5052b2 100644 --- a/src/test/run-pass/intrinsics-integer.rs +++ b/src/test/run-pass/intrinsics-integer.rs @@ -12,7 +12,7 @@ #[feature(globs)]; -extern mod extra; +extern crate extra; mod rusti { extern "rust-intrinsic" { diff --git a/src/test/run-pass/invoke-external-foreign.rs b/src/test/run-pass/invoke-external-foreign.rs index d2fd1555228..def9a590a83 100644 --- a/src/test/run-pass/invoke-external-foreign.rs +++ b/src/test/run-pass/invoke-external-foreign.rs @@ -16,7 +16,7 @@ // successfully (and safely) invoke external, cdecl // functions from outside the crate. -extern mod foreign_lib; +extern crate foreign_lib; pub fn main() { unsafe { diff --git a/src/test/run-pass/issue-10031.rs b/src/test/run-pass/issue-10031.rs index da1460085c0..bde8b194c40 100644 --- a/src/test/run-pass/issue-10031.rs +++ b/src/test/run-pass/issue-10031.rs @@ -10,7 +10,7 @@ // ignore-fast - check-fast doesn't understand aux-build // aux-build:issue_10031_aux.rs -extern mod issue_10031_aux; +extern crate issue_10031_aux; pub fn main() { let _ = issue_10031_aux::Wrap(()); diff --git a/src/test/run-pass/issue-11224.rs b/src/test/run-pass/issue-11224.rs index 74062be6d82..23f1834fe87 100644 --- a/src/test/run-pass/issue-11224.rs +++ b/src/test/run-pass/issue-11224.rs @@ -11,6 +11,6 @@ // aux-build:issue-11224.rs // ignore-fast -extern mod unused = "issue-11224"; +extern crate unused = "issue-11224"; pub fn main() {} diff --git a/src/test/run-pass/issue-11225-1.rs b/src/test/run-pass/issue-11225-1.rs index 212bbba9441..ea0e6615144 100644 --- a/src/test/run-pass/issue-11225-1.rs +++ b/src/test/run-pass/issue-11225-1.rs @@ -11,7 +11,7 @@ // aux-build:issue-11225-1.rs // ignore-fast -extern mod foo = "issue-11225-1"; +extern crate foo = "issue-11225-1"; pub fn main() { foo::foo(1); diff --git a/src/test/run-pass/issue-11225-2.rs b/src/test/run-pass/issue-11225-2.rs index 2fe729067fb..95ed77eba04 100644 --- a/src/test/run-pass/issue-11225-2.rs +++ b/src/test/run-pass/issue-11225-2.rs @@ -11,7 +11,7 @@ // aux-build:issue-11225-2.rs // ignore-fast -extern mod foo = "issue-11225-2"; +extern crate foo = "issue-11225-2"; pub fn main() { foo::foo(1); diff --git a/src/test/run-pass/issue-2316-c.rs b/src/test/run-pass/issue-2316-c.rs index cc859ff3be5..8dd64b1dbc9 100644 --- a/src/test/run-pass/issue-2316-c.rs +++ b/src/test/run-pass/issue-2316-c.rs @@ -12,7 +12,7 @@ // aux-build:issue_2316_a.rs // aux-build:issue_2316_b.rs -extern mod issue_2316_b; +extern crate issue_2316_b; use issue_2316_b::cloth; pub fn main() { diff --git a/src/test/run-pass/issue-2380-b.rs b/src/test/run-pass/issue-2380-b.rs index 3d36c1e2d58..f312a1b080a 100644 --- a/src/test/run-pass/issue-2380-b.rs +++ b/src/test/run-pass/issue-2380-b.rs @@ -11,7 +11,7 @@ // ignore-fast // aux-build:issue-2380.rs -extern mod a; +extern crate a; pub fn main() { a::f::<()>(); diff --git a/src/test/run-pass/issue-2383.rs b/src/test/run-pass/issue-2383.rs index 2798d247c9d..5b13be23f8a 100644 --- a/src/test/run-pass/issue-2383.rs +++ b/src/test/run-pass/issue-2383.rs @@ -10,7 +10,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod collections; +extern crate collections; use collections::RingBuf; use collections::Deque; diff --git a/src/test/run-pass/issue-2414-c.rs b/src/test/run-pass/issue-2414-c.rs index e51f6caa8d3..86cd1576bb0 100644 --- a/src/test/run-pass/issue-2414-c.rs +++ b/src/test/run-pass/issue-2414-c.rs @@ -12,6 +12,6 @@ // aux-build:issue-2414-a.rs // aux-build:issue-2414-b.rs -extern mod b; +extern crate b; pub fn main() {} diff --git a/src/test/run-pass/issue-2472.rs b/src/test/run-pass/issue-2472.rs index 7d1b77d2db9..b025f80a888 100644 --- a/src/test/run-pass/issue-2472.rs +++ b/src/test/run-pass/issue-2472.rs @@ -11,7 +11,7 @@ // aux-build:issue_2472_b.rs // ignore-fast -extern mod issue_2472_b; +extern crate issue_2472_b; use issue_2472_b::{S, T}; diff --git a/src/test/run-pass/issue-2526-a.rs b/src/test/run-pass/issue-2526-a.rs index c58e214113c..b10871f78d4 100644 --- a/src/test/run-pass/issue-2526-a.rs +++ b/src/test/run-pass/issue-2526-a.rs @@ -14,7 +14,7 @@ #[feature(globs)]; #[allow(unused_imports)]; -extern mod issue_2526; +extern crate issue_2526; use issue_2526::*; pub fn main() {} diff --git a/src/test/run-pass/issue-2631-b.rs b/src/test/run-pass/issue-2631-b.rs index 48976a95240..68f2fd95cde 100644 --- a/src/test/run-pass/issue-2631-b.rs +++ b/src/test/run-pass/issue-2631-b.rs @@ -13,7 +13,7 @@ // ignore-fast // aux-build:issue-2631-a.rs -extern mod req; +extern crate req; use req::request; use std::cell::RefCell; diff --git a/src/test/run-pass/issue-2723-b.rs b/src/test/run-pass/issue-2723-b.rs index 142a5cb6500..ef20c481eb9 100644 --- a/src/test/run-pass/issue-2723-b.rs +++ b/src/test/run-pass/issue-2723-b.rs @@ -11,7 +11,7 @@ // ignore-fast: aux-build not compatible with fast // aux-build:issue_2723_a.rs -extern mod issue_2723_a; +extern crate issue_2723_a; use issue_2723_a::f; pub fn main() { diff --git a/src/test/run-pass/issue-2804.rs b/src/test/run-pass/issue-2804.rs index 1ac3c4b0fbc..a9ac81be0ba 100644 --- a/src/test/run-pass/issue-2804.rs +++ b/src/test/run-pass/issue-2804.rs @@ -10,7 +10,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod extra; +extern crate extra; use extra::json; use std::hashmap::HashMap; diff --git a/src/test/run-pass/issue-2904.rs b/src/test/run-pass/issue-2904.rs index 31a51c826c4..2816609ef97 100644 --- a/src/test/run-pass/issue-2904.rs +++ b/src/test/run-pass/issue-2904.rs @@ -14,7 +14,7 @@ /// Map representation -extern mod extra; +extern crate extra; use std::io; use std::to_str; diff --git a/src/test/run-pass/issue-2989.rs b/src/test/run-pass/issue-2989.rs index 9b667ab433b..94e7297f179 100644 --- a/src/test/run-pass/issue-2989.rs +++ b/src/test/run-pass/issue-2989.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod extra; +extern crate extra; use std::vec; diff --git a/src/test/run-pass/issue-3012-2.rs b/src/test/run-pass/issue-3012-2.rs index af45c88d22e..0ffbdc3c5b8 100644 --- a/src/test/run-pass/issue-3012-2.rs +++ b/src/test/run-pass/issue-3012-2.rs @@ -13,7 +13,7 @@ #[feature(managed_boxes)]; -extern mod socketlib; +extern crate socketlib; use socketlib::socket; use std::libc; diff --git a/src/test/run-pass/issue-3424.rs b/src/test/run-pass/issue-3424.rs index b790f732717..374607326df 100644 --- a/src/test/run-pass/issue-3424.rs +++ b/src/test/run-pass/issue-3424.rs @@ -11,7 +11,7 @@ // except according to those terms. // rustc --test ignores2.rs && ./ignores2 -extern mod extra; +extern crate extra; use std::path::{Path}; use std::path; diff --git a/src/test/run-pass/issue-3556.rs b/src/test/run-pass/issue-3556.rs index 9e20de16ae1..e7089a6a21e 100644 --- a/src/test/run-pass/issue-3556.rs +++ b/src/test/run-pass/issue-3556.rs @@ -10,7 +10,7 @@ #[feature(managed_boxes)]; -extern mod extra; +extern crate extra; enum Token { Text(@~str), diff --git a/src/test/run-pass/issue-3563-3.rs b/src/test/run-pass/issue-3563-3.rs index f60d8b2de64..8e5dd762c63 100644 --- a/src/test/run-pass/issue-3563-3.rs +++ b/src/test/run-pass/issue-3563-3.rs @@ -16,7 +16,7 @@ // However the extra library is designed to be optional (for code that must run on constrained // environments like embedded devices or special environments like kernel code) so it must // be explicitly linked in. -extern mod extra; +extern crate extra; // Extern mod controls linkage. Use controls the visibility of names to modules that are // already linked in. Using WriterUtil allows us to use the write_line method. diff --git a/src/test/run-pass/issue-3574.rs b/src/test/run-pass/issue-3574.rs index ace27c5ea11..b216ca9a1ca 100644 --- a/src/test/run-pass/issue-3574.rs +++ b/src/test/run-pass/issue-3574.rs @@ -11,7 +11,7 @@ #[allow(unnecessary_allocation)]; // rustc --test match_borrowed_str.rs.rs && ./match_borrowed_str.rs -extern mod extra; +extern crate extra; fn compare(x: &str, y: &str) -> bool { diff --git a/src/test/run-pass/issue-3609.rs b/src/test/run-pass/issue-3609.rs index 9f6b1578b95..fe9c5d5491f 100644 --- a/src/test/run-pass/issue-3609.rs +++ b/src/test/run-pass/issue-3609.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod extra; +extern crate extra; use std::comm::Chan; use std::task; diff --git a/src/test/run-pass/issue-3979-xcrate.rs b/src/test/run-pass/issue-3979-xcrate.rs index deb0c8ebb7f..a50287de97e 100644 --- a/src/test/run-pass/issue-3979-xcrate.rs +++ b/src/test/run-pass/issue-3979-xcrate.rs @@ -10,7 +10,7 @@ // ignore-fast // aux-build:issue_3979_traits.rs -extern mod issue_3979_traits; +extern crate issue_3979_traits; use issue_3979_traits::{Positioned, Movable}; struct Point { x: int, y: int } diff --git a/src/test/run-pass/issue-4016.rs b/src/test/run-pass/issue-4016.rs index 7f9f48b742a..9c472e9c39a 100644 --- a/src/test/run-pass/issue-4016.rs +++ b/src/test/run-pass/issue-4016.rs @@ -11,8 +11,8 @@ // ignore-fast -extern mod extra; -extern mod serialize; +extern crate extra; +extern crate serialize; use extra::json; use serialize::Decodable; diff --git a/src/test/run-pass/issue-4036.rs b/src/test/run-pass/issue-4036.rs index 476aa8a0712..3b9cabf664a 100644 --- a/src/test/run-pass/issue-4036.rs +++ b/src/test/run-pass/issue-4036.rs @@ -13,8 +13,8 @@ // Issue #4036: Test for an issue that arose around fixing up type inference // byproducts in vtable records. -extern mod extra; -extern mod serialize; +extern crate extra; +extern crate serialize; use extra::json; use serialize::Decodable; diff --git a/src/test/run-pass/issue-4208.rs b/src/test/run-pass/issue-4208.rs index 3615e9cb839..508b4dc0b51 100644 --- a/src/test/run-pass/issue-4208.rs +++ b/src/test/run-pass/issue-4208.rs @@ -11,7 +11,7 @@ // aux-build:issue-4208-cc.rs // ignore-fast - check-fast hates cross-crate tests -extern mod numeric; +extern crate numeric; use numeric::{sin, Angle}; fn foo>(theta: A) -> T { sin(&theta) } diff --git a/src/test/run-pass/issue-4241.rs b/src/test/run-pass/issue-4241.rs index 085f2476c5d..f6c29658e6a 100644 --- a/src/test/run-pass/issue-4241.rs +++ b/src/test/run-pass/issue-4241.rs @@ -11,7 +11,7 @@ // ignore-fast // ignore-test needs networking -extern mod extra; +extern crate extra; use extra::net::tcp::TcpSocketBuf; diff --git a/src/test/run-pass/issue-4545.rs b/src/test/run-pass/issue-4545.rs index 6a5f0772fcf..9781f4aba7e 100644 --- a/src/test/run-pass/issue-4545.rs +++ b/src/test/run-pass/issue-4545.rs @@ -11,5 +11,5 @@ // ignore-fast check-fast doesn't like aux-build // aux-build:issue-4545.rs -extern mod somelib = "issue-4545"; +extern crate somelib = "issue-4545"; pub fn main() { somelib::mk::(); } diff --git a/src/test/run-pass/issue-5521.rs b/src/test/run-pass/issue-5521.rs index 953956337b6..ca62b7bb895 100644 --- a/src/test/run-pass/issue-5521.rs +++ b/src/test/run-pass/issue-5521.rs @@ -13,7 +13,7 @@ #[feature(managed_boxes)]; -extern mod foo = "issue-5521"; +extern crate foo = "issue-5521"; fn foo(a: foo::map) { if false { diff --git a/src/test/run-pass/issue-6919.rs b/src/test/run-pass/issue-6919.rs index 5e56a45622e..6d84268fb41 100644 --- a/src/test/run-pass/issue-6919.rs +++ b/src/test/run-pass/issue-6919.rs @@ -12,7 +12,7 @@ // ignore-fast #[crate_id="issue-6919"]; -extern mod issue6919_3; +extern crate issue6919_3; pub fn main() { issue6919_3::D.k; diff --git a/src/test/run-pass/issue-7178.rs b/src/test/run-pass/issue-7178.rs index 7c44e578144..a20ab1ca9e4 100644 --- a/src/test/run-pass/issue-7178.rs +++ b/src/test/run-pass/issue-7178.rs @@ -11,7 +11,7 @@ // ignore-fast // aux-build:issue-7178.rs -extern mod cross_crate_self = "issue-7178"; +extern crate cross_crate_self = "issue-7178"; pub fn main() { let _ = cross_crate_self::Foo::new(&1i); diff --git a/src/test/run-pass/issue-8044.rs b/src/test/run-pass/issue-8044.rs index 3f3f1d7e1d7..450c8351516 100644 --- a/src/test/run-pass/issue-8044.rs +++ b/src/test/run-pass/issue-8044.rs @@ -11,7 +11,7 @@ // ignore-fast check-fast doesn't like aux-build // aux-build:issue-8044.rs -extern mod minimal = "issue-8044"; +extern crate minimal = "issue-8044"; use minimal::{BTree, leaf}; pub fn main() { diff --git a/src/test/run-pass/issue-8259.rs b/src/test/run-pass/issue-8259.rs index 765852654f9..715c25feff3 100644 --- a/src/test/run-pass/issue-8259.rs +++ b/src/test/run-pass/issue-8259.rs @@ -11,7 +11,7 @@ // ignore-fast // aux-build:issue-8259.rs -extern mod other = "issue-8259"; +extern crate other = "issue-8259"; static a: other::Foo<'static> = other::A; pub fn main() {} diff --git a/src/test/run-pass/issue-8401.rs b/src/test/run-pass/issue-8401.rs index e750066199a..e47d3b8edce 100644 --- a/src/test/run-pass/issue-8401.rs +++ b/src/test/run-pass/issue-8401.rs @@ -11,6 +11,6 @@ // aux-build:issue_8401.rs // ignore-fast -extern mod issue_8401; +extern crate issue_8401; pub fn main() {} diff --git a/src/test/run-pass/issue-8860.rs b/src/test/run-pass/issue-8860.rs index 230dce16151..d22de5ce4c8 100644 --- a/src/test/run-pass/issue-8860.rs +++ b/src/test/run-pass/issue-8860.rs @@ -10,7 +10,7 @@ // ignore-fast -extern mod green; +extern crate green; static mut DROP: int = 0i; static mut DROP_S: int = 0i; diff --git a/src/test/run-pass/issue-9123.rs b/src/test/run-pass/issue-9123.rs index b5aef4b73ac..ea9d7edecd1 100644 --- a/src/test/run-pass/issue-9123.rs +++ b/src/test/run-pass/issue-9123.rs @@ -11,6 +11,6 @@ // ignore-fast check-fast doesn't like aux-build // aux-build:issue_9123.rs -extern mod issue_9123; +extern crate issue_9123; pub fn main() {} diff --git a/src/test/run-pass/issue-9188.rs b/src/test/run-pass/issue-9188.rs index 8f5978d356e..8cded636338 100644 --- a/src/test/run-pass/issue-9188.rs +++ b/src/test/run-pass/issue-9188.rs @@ -11,7 +11,7 @@ // aux-build:issue_9188.rs // ignore-fast check-fast doesn't like aux-build -extern mod issue_9188; +extern crate issue_9188; pub fn main() { let a = issue_9188::bar(); diff --git a/src/test/run-pass/issue-9906.rs b/src/test/run-pass/issue-9906.rs index ea1958a14bb..c32cab9638c 100644 --- a/src/test/run-pass/issue-9906.rs +++ b/src/test/run-pass/issue-9906.rs @@ -8,10 +8,10 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-fast check-fast doesn't like extern mod +// ignore-fast check-fast doesn't like extern crate // aux-build:issue-9906.rs -extern mod testmod = "issue-9906"; +extern crate testmod = "issue-9906"; pub fn main() { testmod::foo(); diff --git a/src/test/run-pass/issue-9968.rs b/src/test/run-pass/issue-9968.rs index c076979060c..468fcdca6bd 100644 --- a/src/test/run-pass/issue-9968.rs +++ b/src/test/run-pass/issue-9968.rs @@ -8,10 +8,10 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-fast check-fast doesn't like extern mod +// ignore-fast check-fast doesn't like extern crate // aux-build:issue-9968.rs -extern mod lib = "issue-9968"; +extern crate lib = "issue-9968"; use lib::{Trait, Struct}; diff --git a/src/test/run-pass/issue2170exe.rs b/src/test/run-pass/issue2170exe.rs index c4d76808013..481b6a2723b 100644 --- a/src/test/run-pass/issue2170exe.rs +++ b/src/test/run-pass/issue2170exe.rs @@ -10,7 +10,7 @@ // ignore-fast - check-fail fast doesn't under aux-build // aux-build:issue2170lib.rs -extern mod issue2170lib; +extern crate issue2170lib; pub fn main() { // let _ = issue2170lib::rsrc(2i32); diff --git a/src/test/run-pass/issue2378c.rs b/src/test/run-pass/issue2378c.rs index 27098d471d1..17733361de4 100644 --- a/src/test/run-pass/issue2378c.rs +++ b/src/test/run-pass/issue2378c.rs @@ -12,8 +12,8 @@ // aux-build:issue2378b.rs // ignore-fast - check-fast doesn't understand aux-build -extern mod issue2378a; -extern mod issue2378b; +extern crate issue2378a; +extern crate issue2378b; use issue2378a::{just}; use issue2378b::{two_maybes}; diff --git a/src/test/run-pass/issue_3136_b.rs b/src/test/run-pass/issue_3136_b.rs index 86b4624c34e..4144e0c85c8 100644 --- a/src/test/run-pass/issue_3136_b.rs +++ b/src/test/run-pass/issue_3136_b.rs @@ -11,5 +11,5 @@ // ignore-fast - check-fast doesn't understand aux-build // aux-build:issue_3136_a.rc -extern mod issue_3136_a; +extern crate issue_3136_a; pub fn main() {} diff --git a/src/test/run-pass/issue_9155.rs b/src/test/run-pass/issue_9155.rs index 48ee1fe70d0..09a6693eb4c 100644 --- a/src/test/run-pass/issue_9155.rs +++ b/src/test/run-pass/issue_9155.rs @@ -11,7 +11,7 @@ // aux-build:issue_9155.rs // ignore-fast check-fast doesn't like the aux-build -extern mod issue_9155; +extern crate issue_9155; struct Baz; diff --git a/src/test/run-pass/item-attributes.rs b/src/test/run-pass/item-attributes.rs index 133660e28d2..8ea06e51080 100644 --- a/src/test/run-pass/item-attributes.rs +++ b/src/test/run-pass/item-attributes.rs @@ -140,7 +140,7 @@ mod test_attr_inner_then_outer_multi { } mod test_distinguish_syntax_ext { - extern mod extra; + extern crate extra; pub fn f() { format!("test{}", "s"); diff --git a/src/test/run-pass/kinds-in-metadata.rs b/src/test/run-pass/kinds-in-metadata.rs index f9165ce309f..7799bd70162 100644 --- a/src/test/run-pass/kinds-in-metadata.rs +++ b/src/test/run-pass/kinds-in-metadata.rs @@ -16,7 +16,7 @@ // Tests that metadata serialization works for the `Pod` kind. -extern mod kinds_in_metadata; +extern crate kinds_in_metadata; use kinds_in_metadata::f; diff --git a/src/test/run-pass/linkage-visibility.rs b/src/test/run-pass/linkage-visibility.rs index 9ac2b710995..e4c0d023298 100644 --- a/src/test/run-pass/linkage-visibility.rs +++ b/src/test/run-pass/linkage-visibility.rs @@ -9,11 +9,11 @@ // except according to those terms. // aux-build:linkage-visibility.rs -// ignore-fast check-fast doesn't like 'extern mod' +// ignore-fast check-fast doesn't like 'extern crate' // ignore-android: FIXME(#10379) // ignore-win32: std::unstable::dynamic_lib does not work on win32 well -extern mod foo = "linkage-visibility"; +extern crate foo = "linkage-visibility"; pub fn main() { foo::test(); diff --git a/src/test/run-pass/log-knows-the-names-of-variants-in-std.rs b/src/test/run-pass/log-knows-the-names-of-variants-in-std.rs index 24eb48e92cd..05c5a7a67f5 100644 --- a/src/test/run-pass/log-knows-the-names-of-variants-in-std.rs +++ b/src/test/run-pass/log-knows-the-names-of-variants-in-std.rs @@ -10,7 +10,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod collections; +extern crate collections; use collections::list; #[deriving(Clone)] diff --git a/src/test/run-pass/logging-right-crate.rs b/src/test/run-pass/logging-right-crate.rs index f140a73a776..68afcc98bba 100644 --- a/src/test/run-pass/logging-right-crate.rs +++ b/src/test/run-pass/logging-right-crate.rs @@ -22,7 +22,7 @@ // longer happens by enabling logging for *this* crate and then invoking a // function in an external crate which will fail when logging is enabled. -extern mod logging_right_crate; +extern crate logging_right_crate; pub fn main() { // this function fails if logging is turned on diff --git a/src/test/run-pass/lots-a-fail.rs b/src/test/run-pass/lots-a-fail.rs index e4886ba115c..9c33ff59dac 100644 --- a/src/test/run-pass/lots-a-fail.rs +++ b/src/test/run-pass/lots-a-fail.rs @@ -10,7 +10,7 @@ // ignore-test linked failure -extern mod extra; +extern crate extra; use std::task; diff --git a/src/test/run-pass/macro-crate-def-only.rs b/src/test/run-pass/macro-crate-def-only.rs index 08529bb2d00..2c2ffd50eae 100644 --- a/src/test/run-pass/macro-crate-def-only.rs +++ b/src/test/run-pass/macro-crate-def-only.rs @@ -14,7 +14,7 @@ #[feature(phase)]; #[phase(syntax)] -extern mod macro_crate_def_only; +extern crate macro_crate_def_only; pub fn main() { assert_eq!(5, make_a_5!()); diff --git a/src/test/run-pass/macro-export-inner-module.rs b/src/test/run-pass/macro-export-inner-module.rs index e31a78e604f..14c6423ce40 100644 --- a/src/test/run-pass/macro-export-inner-module.rs +++ b/src/test/run-pass/macro-export-inner-module.rs @@ -15,7 +15,7 @@ #[feature(phase)]; #[phase(syntax)] -extern mod macro_export_inner_module; +extern crate macro_export_inner_module; pub fn main() { assert_eq!(1, foo!()); diff --git a/src/test/run-pass/match-join.rs b/src/test/run-pass/match-join.rs index 0f01985f274..90768fdc6c9 100644 --- a/src/test/run-pass/match-join.rs +++ b/src/test/run-pass/match-join.rs @@ -9,7 +9,7 @@ // except according to those terms. -extern mod extra; +extern crate extra; fn foo(y: Option) { let mut x: int; diff --git a/src/test/run-pass/monomorphized-callees-with-ty-params-3314.rs b/src/test/run-pass/monomorphized-callees-with-ty-params-3314.rs index 5e03b47d1b1..3bedd340fea 100644 --- a/src/test/run-pass/monomorphized-callees-with-ty-params-3314.rs +++ b/src/test/run-pass/monomorphized-callees-with-ty-params-3314.rs @@ -10,7 +10,7 @@ #[feature(managed_boxes)]; -extern mod extra; +extern crate extra; trait Serializer { } diff --git a/src/test/run-pass/morestack5.rs b/src/test/run-pass/morestack5.rs index c04199dad3e..ba1128978d3 100644 --- a/src/test/run-pass/morestack5.rs +++ b/src/test/run-pass/morestack5.rs @@ -12,7 +12,7 @@ // This test will call __morestack with various minimum stack sizes -extern mod extra; +extern crate extra; use std::task; diff --git a/src/test/run-pass/move-3-unique.rs b/src/test/run-pass/move-3-unique.rs index 46308e02e78..2bd1eb7fd4b 100644 --- a/src/test/run-pass/move-3-unique.rs +++ b/src/test/run-pass/move-3-unique.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod extra; +extern crate extra; #[deriving(Clone)] struct Triple { diff --git a/src/test/run-pass/move-3.rs b/src/test/run-pass/move-3.rs index e915cf6aed7..2819d9bd76e 100644 --- a/src/test/run-pass/move-3.rs +++ b/src/test/run-pass/move-3.rs @@ -10,7 +10,7 @@ #[feature(managed_boxes)]; -extern mod extra; +extern crate extra; struct Triple { x: int, y: int, z: int } diff --git a/src/test/run-pass/move-4-unique.rs b/src/test/run-pass/move-4-unique.rs index 48621cf03be..660fb447bb0 100644 --- a/src/test/run-pass/move-4-unique.rs +++ b/src/test/run-pass/move-4-unique.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod extra; +extern crate extra; struct Triple {a: int, b: int, c: int} diff --git a/src/test/run-pass/move-4.rs b/src/test/run-pass/move-4.rs index ec66e72ac69..67b071af0a2 100644 --- a/src/test/run-pass/move-4.rs +++ b/src/test/run-pass/move-4.rs @@ -10,7 +10,7 @@ #[feature(managed_boxes)]; -extern mod extra; +extern crate extra; struct Triple { a: int, b: int, c: int } diff --git a/src/test/run-pass/moves-based-on-type-cross-crate.rs b/src/test/run-pass/moves-based-on-type-cross-crate.rs index b3ea2b36563..abccd11d8b9 100644 --- a/src/test/run-pass/moves-based-on-type-cross-crate.rs +++ b/src/test/run-pass/moves-based-on-type-cross-crate.rs @@ -11,7 +11,7 @@ // ignore-fast // aux-build:moves_based_on_type_lib.rs -extern mod moves_based_on_type_lib; +extern crate moves_based_on_type_lib; use moves_based_on_type_lib::f; pub fn main() { diff --git a/src/test/run-pass/mutable-alias-vec.rs b/src/test/run-pass/mutable-alias-vec.rs index 9779db91a9c..f512a465985 100644 --- a/src/test/run-pass/mutable-alias-vec.rs +++ b/src/test/run-pass/mutable-alias-vec.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod extra; +extern crate extra; fn grow(v: &mut ~[int]) { v.push(1); diff --git a/src/test/run-pass/native-always-waits.rs b/src/test/run-pass/native-always-waits.rs index 319b2be52e5..18a64c8bd5b 100644 --- a/src/test/run-pass/native-always-waits.rs +++ b/src/test/run-pass/native-always-waits.rs @@ -11,7 +11,7 @@ // ignore-fast // ignore-android (FIXME #11419) -extern mod native; +extern crate native; static mut set: bool = false; diff --git a/src/test/run-pass/nested_item_main.rs b/src/test/run-pass/nested_item_main.rs index 121847ef3cb..5fe1cd7fa55 100644 --- a/src/test/run-pass/nested_item_main.rs +++ b/src/test/run-pass/nested_item_main.rs @@ -11,7 +11,7 @@ // aux-build:nested_item.rs // ignore-fast -extern mod nested_item; +extern crate nested_item; pub fn main() { assert_eq!(2, nested_item::foo::<()>()); diff --git a/src/test/run-pass/newtype-struct-xc-2.rs b/src/test/run-pass/newtype-struct-xc-2.rs index 812bf4d600b..9aec3f2c4f7 100644 --- a/src/test/run-pass/newtype-struct-xc-2.rs +++ b/src/test/run-pass/newtype-struct-xc-2.rs @@ -11,7 +11,7 @@ // ignore-fast // aux-build:newtype_struct_xc.rs -extern mod newtype_struct_xc; +extern crate newtype_struct_xc; use newtype_struct_xc::Au; fn f() -> Au { diff --git a/src/test/run-pass/newtype-struct-xc.rs b/src/test/run-pass/newtype-struct-xc.rs index 6f5da821a10..98a55f29758 100644 --- a/src/test/run-pass/newtype-struct-xc.rs +++ b/src/test/run-pass/newtype-struct-xc.rs @@ -11,7 +11,7 @@ // ignore-fast // aux-build:newtype_struct_xc.rs -extern mod newtype_struct_xc; +extern crate newtype_struct_xc; pub fn main() { let _ = newtype_struct_xc::Au(2); diff --git a/src/test/run-pass/no-std-xcrate.rs b/src/test/run-pass/no-std-xcrate.rs index f5394481172..f149b8645d4 100644 --- a/src/test/run-pass/no-std-xcrate.rs +++ b/src/test/run-pass/no-std-xcrate.rs @@ -14,7 +14,7 @@ // This tests that crates which link to std can also be linked to crates with // #[no_std] that have no lang items. -extern mod no_std_crate; +extern crate no_std_crate; pub fn main() { no_std_crate::foo(); diff --git a/src/test/run-pass/no-std-xcrate2.rs b/src/test/run-pass/no-std-xcrate2.rs index a22814af23e..7e734a7d9e2 100644 --- a/src/test/run-pass/no-std-xcrate2.rs +++ b/src/test/run-pass/no-std-xcrate2.rs @@ -18,7 +18,7 @@ #[no_std]; -extern mod no_std_crate; +extern crate no_std_crate; // This is an unfortunate thing to have to do on linux :( #[cfg(target_os = "linux")] diff --git a/src/test/run-pass/non-boolean-pure-fns.rs b/src/test/run-pass/non-boolean-pure-fns.rs index 60b018fde7a..cb08c81d9e0 100644 --- a/src/test/run-pass/non-boolean-pure-fns.rs +++ b/src/test/run-pass/non-boolean-pure-fns.rs @@ -12,7 +12,7 @@ #[feature(managed_boxes)]; -extern mod collections; +extern crate collections; use collections::list::{List, Cons, Nil, head, is_empty}; diff --git a/src/test/run-pass/once-move-out-on-heap.rs b/src/test/run-pass/once-move-out-on-heap.rs index 7f0b22ed1d0..5067a6c4f92 100644 --- a/src/test/run-pass/once-move-out-on-heap.rs +++ b/src/test/run-pass/once-move-out-on-heap.rs @@ -13,7 +13,7 @@ // ignore-fast #[feature(once_fns)]; -extern mod sync; +extern crate sync; use sync::Arc; fn foo(blk: proc()) { diff --git a/src/test/run-pass/once-move-out-on-stack.rs b/src/test/run-pass/once-move-out-on-stack.rs index 4d344a9b7b6..ffee1e400af 100644 --- a/src/test/run-pass/once-move-out-on-stack.rs +++ b/src/test/run-pass/once-move-out-on-stack.rs @@ -13,7 +13,7 @@ // ignore-fast #[feature(once_fns)]; -extern mod sync; +extern crate sync; use sync::Arc; fn foo(blk: once ||) { diff --git a/src/test/run-pass/packed-struct-size-xc.rs b/src/test/run-pass/packed-struct-size-xc.rs index 13142c7bff8..2ee90eb2c4c 100644 --- a/src/test/run-pass/packed-struct-size-xc.rs +++ b/src/test/run-pass/packed-struct-size-xc.rs @@ -11,7 +11,7 @@ // ignore-fast // aux-build:packed.rs -extern mod packed; +extern crate packed; use std::mem; diff --git a/src/test/run-pass/phase-syntax-link-does-resolve.rs b/src/test/run-pass/phase-syntax-link-does-resolve.rs index a829dd3fbc5..a7b8297487d 100644 --- a/src/test/run-pass/phase-syntax-link-does-resolve.rs +++ b/src/test/run-pass/phase-syntax-link-does-resolve.rs @@ -27,7 +27,7 @@ #[feature(phase)]; #[phase(syntax, link)] -extern mod macro_crate_test; +extern crate macro_crate_test; fn main() { assert_eq!(1, make_a_1!()); diff --git a/src/test/run-pass/placement-new-arena.rs b/src/test/run-pass/placement-new-arena.rs index eed01b6d00a..876d9d2a690 100644 --- a/src/test/run-pass/placement-new-arena.rs +++ b/src/test/run-pass/placement-new-arena.rs @@ -10,7 +10,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod arena; +extern crate arena; use arena::Arena; pub fn main() { diff --git a/src/test/run-pass/preempt.rs b/src/test/run-pass/preempt.rs index 23a6104af7d..5f8da9ddaff 100644 --- a/src/test/run-pass/preempt.rs +++ b/src/test/run-pass/preempt.rs @@ -12,7 +12,7 @@ // This checks that preemption works. // note: halfway done porting to modern rust -extern mod extra; +extern crate extra; use std::comm; use extra::comm; diff --git a/src/test/run-pass/priv-impl-prim-ty.rs b/src/test/run-pass/priv-impl-prim-ty.rs index 46a520ae21c..4c7160a8eee 100644 --- a/src/test/run-pass/priv-impl-prim-ty.rs +++ b/src/test/run-pass/priv-impl-prim-ty.rs @@ -11,7 +11,7 @@ // ignore-fast // aux-build:priv-impl-prim-ty.rs -extern mod bar = "priv-impl-prim-ty"; +extern crate bar = "priv-impl-prim-ty"; pub fn main() { bar::frob(1i); diff --git a/src/test/run-pass/privacy-reexport.rs b/src/test/run-pass/privacy-reexport.rs index a2845d020b2..e9450d1e77d 100644 --- a/src/test/run-pass/privacy-reexport.rs +++ b/src/test/run-pass/privacy-reexport.rs @@ -11,7 +11,7 @@ // ignore-fast // aux-build:privacy_reexport.rs -extern mod privacy_reexport; +extern crate privacy_reexport; pub fn main() { privacy_reexport::bar::frob(); diff --git a/src/test/run-pass/pub-use-xcrate.rs b/src/test/run-pass/pub-use-xcrate.rs index 0a25840c393..2d4f5f743b8 100644 --- a/src/test/run-pass/pub-use-xcrate.rs +++ b/src/test/run-pass/pub-use-xcrate.rs @@ -12,7 +12,7 @@ // aux-build:pub_use_xcrate1.rs // aux-build:pub_use_xcrate2.rs -extern mod pub_use_xcrate2; +extern crate pub_use_xcrate2; use pub_use_xcrate2::Foo; diff --git a/src/test/run-pass/pub_use_mods_xcrate_exe.rs b/src/test/run-pass/pub_use_mods_xcrate_exe.rs index 3672d05f87a..87185e39aa9 100644 --- a/src/test/run-pass/pub_use_mods_xcrate_exe.rs +++ b/src/test/run-pass/pub_use_mods_xcrate_exe.rs @@ -13,7 +13,7 @@ #[allow(unused_imports)]; -extern mod pub_use_mods_xcrate; +extern crate pub_use_mods_xcrate; use pub_use_mods_xcrate::a::c; pub fn main(){} diff --git a/src/test/run-pass/reexport-should-still-link.rs b/src/test/run-pass/reexport-should-still-link.rs index c5f27ab5e5b..0c22fcb44e9 100644 --- a/src/test/run-pass/reexport-should-still-link.rs +++ b/src/test/run-pass/reexport-should-still-link.rs @@ -9,9 +9,9 @@ // except according to those terms. // aux-build:reexport-should-still-link.rs -// ignore-fast check-fast doesn't like extern mod +// ignore-fast check-fast doesn't like extern crate -extern mod foo = "reexport-should-still-link"; +extern crate foo = "reexport-should-still-link"; pub fn main() { foo::bar(); diff --git a/src/test/run-pass/reexported-static-methods-cross-crate.rs b/src/test/run-pass/reexported-static-methods-cross-crate.rs index 330776ca046..b3a7cf74428 100644 --- a/src/test/run-pass/reexported-static-methods-cross-crate.rs +++ b/src/test/run-pass/reexported-static-methods-cross-crate.rs @@ -10,7 +10,7 @@ // ignore-fast // aux-build:reexported_static_methods.rs -extern mod reexported_static_methods; +extern crate reexported_static_methods; use reexported_static_methods::Foo; use reexported_static_methods::Baz; diff --git a/src/test/run-pass/regions-lifetime-static-items-enclosing-scopes.rs b/src/test/run-pass/regions-lifetime-static-items-enclosing-scopes.rs index e20717553c4..975dcab1902 100644 --- a/src/test/run-pass/regions-lifetime-static-items-enclosing-scopes.rs +++ b/src/test/run-pass/regions-lifetime-static-items-enclosing-scopes.rs @@ -11,7 +11,7 @@ // This test verifies that temporary lifetime is correctly computed // for static objects in enclosing scopes. -extern mod extra; +extern crate extra; use std::cmp::Eq; fn f(o: &mut Option) { diff --git a/src/test/run-pass/regions-mock-tcx.rs b/src/test/run-pass/regions-mock-tcx.rs index 43a8b452537..738a4899f27 100644 --- a/src/test/run-pass/regions-mock-tcx.rs +++ b/src/test/run-pass/regions-mock-tcx.rs @@ -16,7 +16,7 @@ // - Multiple lifetime parameters // - Arenas -extern mod arena; +extern crate arena; use arena::Arena; use std::hashmap::HashMap; diff --git a/src/test/run-pass/rename-directory.rs b/src/test/run-pass/rename-directory.rs index 83f77baf568..3f14d7befac 100644 --- a/src/test/run-pass/rename-directory.rs +++ b/src/test/run-pass/rename-directory.rs @@ -12,7 +12,7 @@ // because it needs TempDir, which is in extra // ignore-fast -extern mod extra; +extern crate extra; use extra::tempfile::TempDir; use std::os; diff --git a/src/test/run-pass/send-iloop.rs b/src/test/run-pass/send-iloop.rs index 11f9252f22f..5116dcb8dc8 100644 --- a/src/test/run-pass/send-iloop.rs +++ b/src/test/run-pass/send-iloop.rs @@ -9,7 +9,7 @@ // except according to those terms. // ignore-test linked failure -extern mod extra; +extern crate extra; use std::comm; use std::task; diff --git a/src/test/run-pass/send_str_treemap.rs b/src/test/run-pass/send_str_treemap.rs index 1b7d7bf0b4b..1543d34ae88 100644 --- a/src/test/run-pass/send_str_treemap.rs +++ b/src/test/run-pass/send_str_treemap.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod collections; +extern crate collections; use std::clone::{Clone, DeepClone}; use std::cmp::{TotalEq, Ord, TotalOrd, Equiv}; diff --git a/src/test/run-pass/spawn.rs b/src/test/run-pass/spawn.rs index d95f032e814..00273669378 100644 --- a/src/test/run-pass/spawn.rs +++ b/src/test/run-pass/spawn.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod extra; +extern crate extra; use std::task; diff --git a/src/test/run-pass/stat.rs b/src/test/run-pass/stat.rs index c3e87d27ef2..33f4c9d9a98 100644 --- a/src/test/run-pass/stat.rs +++ b/src/test/run-pass/stat.rs @@ -10,7 +10,7 @@ // ignore-fast -extern mod extra; +extern crate extra; use extra::tempfile; use std::io::File; diff --git a/src/test/run-pass/static-fn-inline-xc.rs b/src/test/run-pass/static-fn-inline-xc.rs index a6b1c649ddf..f679de04ba2 100644 --- a/src/test/run-pass/static-fn-inline-xc.rs +++ b/src/test/run-pass/static-fn-inline-xc.rs @@ -11,7 +11,7 @@ // ignore-fast // aux-build:static_fn_inline_xc_aux.rs -extern mod mycore = "static_fn_inline_xc_aux"; +extern crate mycore = "static_fn_inline_xc_aux"; use mycore::num; diff --git a/src/test/run-pass/static-fn-trait-xc.rs b/src/test/run-pass/static-fn-trait-xc.rs index 6c0a6461057..5643429d8e3 100644 --- a/src/test/run-pass/static-fn-trait-xc.rs +++ b/src/test/run-pass/static-fn-trait-xc.rs @@ -11,7 +11,7 @@ // aux-build:static_fn_trait_xc_aux.rs // ignore-fast -extern mod mycore = "static_fn_trait_xc_aux"; +extern crate mycore = "static_fn_trait_xc_aux"; use mycore::num; diff --git a/src/test/run-pass/static-function-pointer-xc.rs b/src/test/run-pass/static-function-pointer-xc.rs index 22a7c0aa391..8471b633792 100644 --- a/src/test/run-pass/static-function-pointer-xc.rs +++ b/src/test/run-pass/static-function-pointer-xc.rs @@ -10,7 +10,7 @@ // ignore-fast // aux-build:static-function-pointer-aux.rs -extern mod aux = "static-function-pointer-aux"; +extern crate aux = "static-function-pointer-aux"; fn f(x: int) -> int { x } diff --git a/src/test/run-pass/static-method-xcrate.rs b/src/test/run-pass/static-method-xcrate.rs index 343155cc99f..db3f61567d8 100644 --- a/src/test/run-pass/static-method-xcrate.rs +++ b/src/test/run-pass/static-method-xcrate.rs @@ -11,7 +11,7 @@ // ignore-fast // aux-build:static-methods-crate.rs -extern mod static_methods_crate; +extern crate static_methods_crate; use static_methods_crate::read; diff --git a/src/test/run-pass/static-mut-xc.rs b/src/test/run-pass/static-mut-xc.rs index 9228434735a..c7b17d91a8f 100644 --- a/src/test/run-pass/static-mut-xc.rs +++ b/src/test/run-pass/static-mut-xc.rs @@ -15,7 +15,7 @@ // ignore-fast // aux-build:static_mut_xc.rs -extern mod static_mut_xc; +extern crate static_mut_xc; unsafe fn static_bound(_: &'static int) {} diff --git a/src/test/run-pass/str-append.rs b/src/test/run-pass/str-append.rs index bede746f569..c6ff57ac4e8 100644 --- a/src/test/run-pass/str-append.rs +++ b/src/test/run-pass/str-append.rs @@ -10,7 +10,7 @@ -extern mod extra; +extern crate extra; fn test1() { let mut s: ~str = ~"hello"; diff --git a/src/test/run-pass/str-multiline.rs b/src/test/run-pass/str-multiline.rs index 59736829a23..3c5a860d6c8 100644 --- a/src/test/run-pass/str-multiline.rs +++ b/src/test/run-pass/str-multiline.rs @@ -10,7 +10,7 @@ -extern mod extra; +extern crate extra; pub fn main() { let a: ~str = ~"this \ diff --git a/src/test/run-pass/string-self-append.rs b/src/test/run-pass/string-self-append.rs index 68f1e21571c..34a818879d0 100644 --- a/src/test/run-pass/string-self-append.rs +++ b/src/test/run-pass/string-self-append.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod extra; +extern crate extra; pub fn main() { // Make sure we properly handle repeated self-appends. diff --git a/src/test/run-pass/struct-destructuring-cross-crate.rs b/src/test/run-pass/struct-destructuring-cross-crate.rs index f7db1ae37b8..31ba7149c29 100644 --- a/src/test/run-pass/struct-destructuring-cross-crate.rs +++ b/src/test/run-pass/struct-destructuring-cross-crate.rs @@ -11,7 +11,7 @@ // ignore-fast // aux-build:struct_destructuring_cross_crate.rs -extern mod struct_destructuring_cross_crate; +extern crate struct_destructuring_cross_crate; pub fn main() { let x = struct_destructuring_cross_crate::S { x: 1, y: 2 }; diff --git a/src/test/run-pass/struct_variant_xc.rs b/src/test/run-pass/struct_variant_xc.rs index bb3d07581bc..c9cd64161b7 100644 --- a/src/test/run-pass/struct_variant_xc.rs +++ b/src/test/run-pass/struct_variant_xc.rs @@ -10,7 +10,7 @@ // ignore-fast - check-fast doesn't understand aux-build // aux-build:struct_variant_xc_aux.rs -extern mod struct_variant_xc_aux; +extern crate struct_variant_xc_aux; use struct_variant_xc_aux::Variant; diff --git a/src/test/run-pass/task-comm-0.rs b/src/test/run-pass/task-comm-0.rs index ee88670ca14..f02e3a17813 100644 --- a/src/test/run-pass/task-comm-0.rs +++ b/src/test/run-pass/task-comm-0.rs @@ -10,7 +10,7 @@ // ignore-fast -extern mod extra; +extern crate extra; use std::task; diff --git a/src/test/run-pass/task-comm-10.rs b/src/test/run-pass/task-comm-10.rs index 8e7250f6ab4..1c64cf9cff5 100644 --- a/src/test/run-pass/task-comm-10.rs +++ b/src/test/run-pass/task-comm-10.rs @@ -10,7 +10,7 @@ // ignore-fast -extern mod extra; +extern crate extra; use std::task; diff --git a/src/test/run-pass/task-comm-11.rs b/src/test/run-pass/task-comm-11.rs index 4392419d26d..3d6e841d318 100644 --- a/src/test/run-pass/task-comm-11.rs +++ b/src/test/run-pass/task-comm-11.rs @@ -10,7 +10,7 @@ // ignore-fast -extern mod extra; +extern crate extra; use std::task; diff --git a/src/test/run-pass/task-comm-12.rs b/src/test/run-pass/task-comm-12.rs index f6f6f3ba240..8092fb6d4ad 100644 --- a/src/test/run-pass/task-comm-12.rs +++ b/src/test/run-pass/task-comm-12.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod extra; +extern crate extra; use std::task; diff --git a/src/test/run-pass/task-comm-13.rs b/src/test/run-pass/task-comm-13.rs index 53386c2f845..6f22eb97c51 100644 --- a/src/test/run-pass/task-comm-13.rs +++ b/src/test/run-pass/task-comm-13.rs @@ -10,7 +10,7 @@ // ignore-fast -extern mod extra; +extern crate extra; use std::task; diff --git a/src/test/run-pass/task-comm-15.rs b/src/test/run-pass/task-comm-15.rs index b1cde6b9357..4e4d38b9605 100644 --- a/src/test/run-pass/task-comm-15.rs +++ b/src/test/run-pass/task-comm-15.rs @@ -10,7 +10,7 @@ // ignore-fast -extern mod extra; +extern crate extra; use std::task; diff --git a/src/test/run-pass/task-comm-17.rs b/src/test/run-pass/task-comm-17.rs index 4f9285d30b9..70a59c5b85d 100644 --- a/src/test/run-pass/task-comm-17.rs +++ b/src/test/run-pass/task-comm-17.rs @@ -12,7 +12,7 @@ // This test is specifically about spawning temporary closures. -extern mod extra; +extern crate extra; use std::task; diff --git a/src/test/run-pass/task-comm-3.rs b/src/test/run-pass/task-comm-3.rs index f5374e7df05..732d72c11fe 100644 --- a/src/test/run-pass/task-comm-3.rs +++ b/src/test/run-pass/task-comm-3.rs @@ -10,7 +10,7 @@ // ignore-fast -extern mod extra; +extern crate extra; use std::task; diff --git a/src/test/run-pass/task-comm-5.rs b/src/test/run-pass/task-comm-5.rs index c63bf12db2b..64ccf4f3df8 100644 --- a/src/test/run-pass/task-comm-5.rs +++ b/src/test/run-pass/task-comm-5.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod extra; +extern crate extra; pub fn main() { test00(); } diff --git a/src/test/run-pass/task-comm-7.rs b/src/test/run-pass/task-comm-7.rs index ff43a80adac..e72e5677776 100644 --- a/src/test/run-pass/task-comm-7.rs +++ b/src/test/run-pass/task-comm-7.rs @@ -12,7 +12,7 @@ #[allow(dead_assignment)]; -extern mod extra; +extern crate extra; use std::task; diff --git a/src/test/run-pass/task-comm-9.rs b/src/test/run-pass/task-comm-9.rs index d275aec5894..4a053b0c47a 100644 --- a/src/test/run-pass/task-comm-9.rs +++ b/src/test/run-pass/task-comm-9.rs @@ -10,7 +10,7 @@ // ignore-fast -extern mod extra; +extern crate extra; use std::task; diff --git a/src/test/run-pass/task-comm-chan-nil.rs b/src/test/run-pass/task-comm-chan-nil.rs index 32774007049..f5fe5be0d76 100644 --- a/src/test/run-pass/task-comm-chan-nil.rs +++ b/src/test/run-pass/task-comm-chan-nil.rs @@ -9,7 +9,7 @@ // except according to those terms. -extern mod extra; +extern crate extra; // rustboot can't transmit nils across channels because they don't have // any size, but rustc currently can because they do have size. Whether diff --git a/src/test/run-pass/task-life-0.rs b/src/test/run-pass/task-life-0.rs index b60e3f2a4ee..54aac31c7de 100644 --- a/src/test/run-pass/task-life-0.rs +++ b/src/test/run-pass/task-life-0.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod extra; +extern crate extra; use std::task; diff --git a/src/test/run-pass/tempfile.rs b/src/test/run-pass/tempfile.rs index 077a0c46ecb..d42ce9793e0 100644 --- a/src/test/run-pass/tempfile.rs +++ b/src/test/run-pass/tempfile.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-fast check-fast doesn't like 'extern mod' +// ignore-fast check-fast doesn't like 'extern crate' // ignore-win32 TempDir may cause IoError on windows: #10463 // These tests are here to exercise the functionality of the `tempfile` module. @@ -19,7 +19,7 @@ // they're in a different location than before. Hence, these tests are all run // serially here. -extern mod extra; +extern crate extra; use extra::tempfile::TempDir; use std::io::fs; diff --git a/src/test/run-pass/terminate-in-initializer.rs b/src/test/run-pass/terminate-in-initializer.rs index aaedb2d322b..b63573f6103 100644 --- a/src/test/run-pass/terminate-in-initializer.rs +++ b/src/test/run-pass/terminate-in-initializer.rs @@ -13,7 +13,7 @@ // Issue #787 // Don't try to clean up uninitialized locals -extern mod extra; +extern crate extra; use std::task; diff --git a/src/test/run-pass/test-ignore-cfg.rs b/src/test/run-pass/test-ignore-cfg.rs index 89579c541d2..eee667fdb04 100644 --- a/src/test/run-pass/test-ignore-cfg.rs +++ b/src/test/run-pass/test-ignore-cfg.rs @@ -11,7 +11,7 @@ // compile-flags: --test --cfg ignorecfg // ignore-fast -extern mod extra; +extern crate extra; #[test] #[ignore(cfg(ignorecfg))] diff --git a/src/test/run-pass/test-runner-hides-main.rs b/src/test/run-pass/test-runner-hides-main.rs index 42810f3e0ee..cdef159b399 100644 --- a/src/test/run-pass/test-runner-hides-main.rs +++ b/src/test/run-pass/test-runner-hides-main.rs @@ -12,7 +12,7 @@ // ignore-fast // ignore-win32 #10872 -extern mod extra; +extern crate extra; // Building as a test runner means that a synthetic main will be run, // not ours diff --git a/src/test/run-pass/threads.rs b/src/test/run-pass/threads.rs index 7df9dac219a..3e1d5b3684d 100644 --- a/src/test/run-pass/threads.rs +++ b/src/test/run-pass/threads.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod extra; +extern crate extra; use std::task; diff --git a/src/test/run-pass/trait-bounds-in-arc.rs b/src/test/run-pass/trait-bounds-in-arc.rs index 4989a13957a..fa94f1012d0 100644 --- a/src/test/run-pass/trait-bounds-in-arc.rs +++ b/src/test/run-pass/trait-bounds-in-arc.rs @@ -15,7 +15,7 @@ // ignore-fast -extern mod sync; +extern crate sync; use sync::Arc; use std::task; diff --git a/src/test/run-pass/trait-default-method-xc-2.rs b/src/test/run-pass/trait-default-method-xc-2.rs index 777881f9360..ccd7c9b8a3a 100644 --- a/src/test/run-pass/trait-default-method-xc-2.rs +++ b/src/test/run-pass/trait-default-method-xc-2.rs @@ -13,8 +13,8 @@ // aux-build:trait_default_method_xc_aux_2.rs -extern mod aux = "trait_default_method_xc_aux"; -extern mod aux2 = "trait_default_method_xc_aux_2"; +extern crate aux = "trait_default_method_xc_aux"; +extern crate aux2 = "trait_default_method_xc_aux_2"; use aux::A; use aux2::{a_struct, welp}; diff --git a/src/test/run-pass/trait-default-method-xc.rs b/src/test/run-pass/trait-default-method-xc.rs index 7ad658527c9..c0344136059 100644 --- a/src/test/run-pass/trait-default-method-xc.rs +++ b/src/test/run-pass/trait-default-method-xc.rs @@ -11,7 +11,7 @@ // ignore-fast // aux-build:trait_default_method_xc_aux.rs -extern mod aux = "trait_default_method_xc_aux"; +extern crate aux = "trait_default_method_xc_aux"; use aux::{A, TestEquality, Something}; use aux::B; diff --git a/src/test/run-pass/trait-inheritance-auto-xc-2.rs b/src/test/run-pass/trait-inheritance-auto-xc-2.rs index 4f5b6a783f5..bf6c429b6c8 100644 --- a/src/test/run-pass/trait-inheritance-auto-xc-2.rs +++ b/src/test/run-pass/trait-inheritance-auto-xc-2.rs @@ -11,7 +11,7 @@ // ignore-fast // aux-build:trait_inheritance_auto_xc_2_aux.rs -extern mod aux = "trait_inheritance_auto_xc_2_aux"; +extern crate aux = "trait_inheritance_auto_xc_2_aux"; // aux defines impls of Foo, Bar and Baz for A use aux::{Foo, Bar, Baz, A}; diff --git a/src/test/run-pass/trait-inheritance-auto-xc.rs b/src/test/run-pass/trait-inheritance-auto-xc.rs index dfaddea86c2..ef72611e76f 100644 --- a/src/test/run-pass/trait-inheritance-auto-xc.rs +++ b/src/test/run-pass/trait-inheritance-auto-xc.rs @@ -11,7 +11,7 @@ // ignore-fast // aux-build:trait_inheritance_auto_xc_aux.rs -extern mod aux = "trait_inheritance_auto_xc_aux"; +extern crate aux = "trait_inheritance_auto_xc_aux"; use aux::{Foo, Bar, Baz, Quux}; diff --git a/src/test/run-pass/trait-inheritance-cross-trait-call-xc.rs b/src/test/run-pass/trait-inheritance-cross-trait-call-xc.rs index 1915a136afc..cdc0c5a80a9 100644 --- a/src/test/run-pass/trait-inheritance-cross-trait-call-xc.rs +++ b/src/test/run-pass/trait-inheritance-cross-trait-call-xc.rs @@ -11,7 +11,7 @@ // ignore-fast // aux-build:trait_inheritance_cross_trait_call_xc_aux.rs -extern mod aux = "trait_inheritance_cross_trait_call_xc_aux"; +extern crate aux = "trait_inheritance_cross_trait_call_xc_aux"; use aux::Foo; diff --git a/src/test/run-pass/trait-inheritance-num.rs b/src/test/run-pass/trait-inheritance-num.rs index 49457d52161..b7d5f9c6fd6 100644 --- a/src/test/run-pass/trait-inheritance-num.rs +++ b/src/test/run-pass/trait-inheritance-num.rs @@ -10,7 +10,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod extra; +extern crate extra; use std::cmp::{Eq, Ord}; use std::num::NumCast; diff --git a/src/test/run-pass/trait-inheritance-num2.rs b/src/test/run-pass/trait-inheritance-num2.rs index eccafcf5be8..5e6dc7c67c8 100644 --- a/src/test/run-pass/trait-inheritance-num2.rs +++ b/src/test/run-pass/trait-inheritance-num2.rs @@ -12,7 +12,7 @@ // A more complex example of numeric extensions -extern mod extra; +extern crate extra; use std::cmp::{Eq, Ord}; diff --git a/src/test/run-pass/trait-inheritance-overloading-xc-exe.rs b/src/test/run-pass/trait-inheritance-overloading-xc-exe.rs index 838a5a337a3..faadc68f135 100644 --- a/src/test/run-pass/trait-inheritance-overloading-xc-exe.rs +++ b/src/test/run-pass/trait-inheritance-overloading-xc-exe.rs @@ -11,7 +11,7 @@ // ignore-fast - check-fast doesn't understand aux-build // aux-build:trait_inheritance_overloading_xc.rs -extern mod trait_inheritance_overloading_xc; +extern crate trait_inheritance_overloading_xc; use trait_inheritance_overloading_xc::{MyNum, MyInt}; fn f(x: T, y: T) -> (T, T, T) { diff --git a/src/test/run-pass/trait-typedef-cc.rs b/src/test/run-pass/trait-typedef-cc.rs index e50abf06ddf..62cda8ed82d 100644 --- a/src/test/run-pass/trait-typedef-cc.rs +++ b/src/test/run-pass/trait-typedef-cc.rs @@ -10,7 +10,7 @@ // ignore-test FIXME: #3907 // aux-build:trait_typedef_cc.rs -extern mod trait_typedef_cc; +extern crate trait_typedef_cc; type Foo = trait_typedef_cc::Foo; diff --git a/src/test/run-pass/type-sizes.rs b/src/test/run-pass/type-sizes.rs index 2cdff23050d..970a5c5011b 100644 --- a/src/test/run-pass/type-sizes.rs +++ b/src/test/run-pass/type-sizes.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod std; +extern crate std; use std::mem::size_of; struct t {a: u8, b: i8} diff --git a/src/test/run-pass/typeid-intrinsic.rs b/src/test/run-pass/typeid-intrinsic.rs index 1a386a0c76f..71e19b51c72 100644 --- a/src/test/run-pass/typeid-intrinsic.rs +++ b/src/test/run-pass/typeid-intrinsic.rs @@ -12,8 +12,8 @@ // aux-build:typeid-intrinsic.rs // aux-build:typeid-intrinsic2.rs -extern mod other1 = "typeid-intrinsic"; -extern mod other2 = "typeid-intrinsic2"; +extern crate other1 = "typeid-intrinsic"; +extern crate other2 = "typeid-intrinsic2"; use std::unstable::intrinsics; use std::unstable::intrinsics::TypeId; diff --git a/src/test/run-pass/unify-return-ty.rs b/src/test/run-pass/unify-return-ty.rs index 8bdce601b28..fc0d4ce4b89 100644 --- a/src/test/run-pass/unify-return-ty.rs +++ b/src/test/run-pass/unify-return-ty.rs @@ -11,7 +11,7 @@ // Tests that the tail expr in null() has its type // unified with the type *T, and so the type variable // in that type gets resolved. -extern mod extra; +extern crate extra; use std::cast; diff --git a/src/test/run-pass/unwind-box.rs b/src/test/run-pass/unwind-box.rs index 173919608de..beaf76cafbc 100644 --- a/src/test/run-pass/unwind-box.rs +++ b/src/test/run-pass/unwind-box.rs @@ -10,7 +10,7 @@ #[feature(managed_boxes)]; -extern mod extra; +extern crate extra; use std::task; diff --git a/src/test/run-pass/unwind-resource.rs b/src/test/run-pass/unwind-resource.rs index e643a20436e..8143188b977 100644 --- a/src/test/run-pass/unwind-resource.rs +++ b/src/test/run-pass/unwind-resource.rs @@ -10,7 +10,7 @@ // ignore-fast -extern mod extra; +extern crate extra; use std::task; diff --git a/src/test/run-pass/unwind-resource2.rs b/src/test/run-pass/unwind-resource2.rs index 38e5a122a12..176eb02105f 100644 --- a/src/test/run-pass/unwind-resource2.rs +++ b/src/test/run-pass/unwind-resource2.rs @@ -10,7 +10,7 @@ #[feature(managed_boxes)]; -extern mod extra; +extern crate extra; use std::task; diff --git a/src/test/run-pass/unwind-unique.rs b/src/test/run-pass/unwind-unique.rs index e2e64d72575..dabe8c3450b 100644 --- a/src/test/run-pass/unwind-unique.rs +++ b/src/test/run-pass/unwind-unique.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod extra; +extern crate extra; use std::task; diff --git a/src/test/run-pass/use-crate-name-alias.rs b/src/test/run-pass/use-crate-name-alias.rs index d9f40e5f1f3..9c53dde21dd 100644 --- a/src/test/run-pass/use-crate-name-alias.rs +++ b/src/test/run-pass/use-crate-name-alias.rs @@ -9,6 +9,6 @@ // except according to those terms. // Issue #1706 -extern mod stdlib = "extra"; +extern crate stdlib = "extra"; pub fn main() {} diff --git a/src/test/run-pass/use.rs b/src/test/run-pass/use.rs index a8646441e74..1d65a0a5e9e 100644 --- a/src/test/run-pass/use.rs +++ b/src/test/run-pass/use.rs @@ -15,9 +15,9 @@ #[allow(unused_imports)]; #[no_std]; -extern mod std; -extern mod zed = "std"; -extern mod bar = "std#0.10-pre"; +extern crate std; +extern crate zed = "std"; +extern crate bar = "std#0.10-pre"; use std::str; diff --git a/src/test/run-pass/use_inline_dtor.rs b/src/test/run-pass/use_inline_dtor.rs index a041cfc3334..9cb11c10e3e 100644 --- a/src/test/run-pass/use_inline_dtor.rs +++ b/src/test/run-pass/use_inline_dtor.rs @@ -11,7 +11,7 @@ // aux-build:inline_dtor.rs // ignore-fast -extern mod inline_dtor; +extern crate inline_dtor; pub fn main() { let _x = inline_dtor::Foo; diff --git a/src/test/run-pass/utf8_chars.rs b/src/test/run-pass/utf8_chars.rs index 4c86b5eb2be..3066a247e4e 100644 --- a/src/test/run-pass/utf8_chars.rs +++ b/src/test/run-pass/utf8_chars.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod extra; +extern crate extra; use std::str; diff --git a/src/test/run-pass/vec-self-append.rs b/src/test/run-pass/vec-self-append.rs index ce70643cfc6..e9fcfaaf283 100644 --- a/src/test/run-pass/vec-self-append.rs +++ b/src/test/run-pass/vec-self-append.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -extern mod extra; +extern crate extra; fn test_heap_to_heap() { // a spills onto the heap diff --git a/src/test/run-pass/xcrate-address-insignificant.rs b/src/test/run-pass/xcrate-address-insignificant.rs index 01ffdc1f2ef..b231b859a06 100644 --- a/src/test/run-pass/xcrate-address-insignificant.rs +++ b/src/test/run-pass/xcrate-address-insignificant.rs @@ -11,7 +11,7 @@ // ignore-fast check-fast doesn't like aux-build // aux-build:xcrate_address_insignificant.rs -extern mod foo = "xcrate_address_insignificant"; +extern crate foo = "xcrate_address_insignificant"; pub fn main() { assert_eq!(foo::foo::(), foo::bar()); diff --git a/src/test/run-pass/xcrate-static-addresses.rs b/src/test/run-pass/xcrate-static-addresses.rs index b1335d35728..d3184968ee6 100644 --- a/src/test/run-pass/xcrate-static-addresses.rs +++ b/src/test/run-pass/xcrate-static-addresses.rs @@ -11,7 +11,7 @@ // ignore-fast // aux-build:xcrate_static_addresses.rs -extern mod xcrate_static_addresses; +extern crate xcrate_static_addresses; use other = xcrate_static_addresses; diff --git a/src/test/run-pass/xcrate-trait-lifetime-param.rs b/src/test/run-pass/xcrate-trait-lifetime-param.rs index a26a3ebeb8c..b5aae62841f 100644 --- a/src/test/run-pass/xcrate-trait-lifetime-param.rs +++ b/src/test/run-pass/xcrate-trait-lifetime-param.rs @@ -11,7 +11,7 @@ // ignore-fast // aux-build:xcrate-trait-lifetime-param.rs -extern mod other = "xcrate-trait-lifetime-param"; +extern crate other = "xcrate-trait-lifetime-param"; struct Reader<'a> { b : &'a [u8] diff --git a/src/test/run-pass/xcrate-unit-struct.rs b/src/test/run-pass/xcrate-unit-struct.rs index 927881d7c17..3a440037cf8 100644 --- a/src/test/run-pass/xcrate-unit-struct.rs +++ b/src/test/run-pass/xcrate-unit-struct.rs @@ -10,7 +10,7 @@ // aux-build:xcrate_unit_struct.rs // ignore-fast -extern mod xcrate_unit_struct; +extern crate xcrate_unit_struct; static s1: xcrate_unit_struct::Struct = xcrate_unit_struct::Struct; static s2: xcrate_unit_struct::Unit = xcrate_unit_struct::Unit;