diff options
| author | Patrick Walton <pcwalton@mimiga.net> | 2012-09-05 12:32:05 -0700 |
|---|---|---|
| committer | Patrick Walton <pcwalton@mimiga.net> | 2012-09-05 12:32:05 -0700 |
| commit | f686896f60d901fd7f97add72fbc047691027baa (patch) | |
| tree | 5cfb0f00f9d0eaef93839f33adf532bea5846c33 /src/test/compile-fail | |
| parent | 47dac47e96fb47f84ac2f75781e2819ce80791a4 (diff) | |
| download | rust-f686896f60d901fd7f97add72fbc047691027baa.tar.gz rust-f686896f60d901fd7f97add72fbc047691027baa.zip | |
test: "import" -> "use"
Diffstat (limited to 'src/test/compile-fail')
46 files changed, 61 insertions, 66 deletions
diff --git a/src/test/compile-fail/ambig_impl_2_exe.rs b/src/test/compile-fail/ambig_impl_2_exe.rs index 51c19db4a94..d53c924bdce 100644 --- a/src/test/compile-fail/ambig_impl_2_exe.rs +++ b/src/test/compile-fail/ambig_impl_2_exe.rs @@ -1,7 +1,7 @@ // xfail-fast aux-build // aux-build:ambig_impl_2_lib.rs use ambig_impl_2_lib; -import ambig_impl_2_lib::me; +use ambig_impl_2_lib::me; trait me { fn me() -> 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 2a2e5049bad..028f5ed626c 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 @@ -1,7 +1,7 @@ // xfail-test // error-pattern: instantiating a type parameter with an incompatible type use std; -import std::arc::rw_arc; +use std::arc::rw_arc; fn main() { let arc1 = ~rw_arc(true); 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 52ea25257ad..371523bc028 100644 --- a/src/test/compile-fail/arc-rw-cond-shouldnt-escape.rs +++ b/src/test/compile-fail/arc-rw-cond-shouldnt-escape.rs @@ -1,6 +1,6 @@ // error-pattern: reference is not valid outside of its lifetime use std; -import std::arc; +use std::arc; fn main() { let x = ~arc::RWARC(1); let mut y = None; 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 104e4f103d3..781060d0bb7 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 @@ -1,5 +1,5 @@ use std; -import std::arc; +use std::arc; fn main() { let x = ~arc::RWARC(1); let mut y = None; 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 1639f9a86b4..622e01c2586 100644 --- a/src/test/compile-fail/arc-rw-state-shouldnt-escape.rs +++ b/src/test/compile-fail/arc-rw-state-shouldnt-escape.rs @@ -1,6 +1,6 @@ // error-pattern: reference is not valid outside of its lifetime use std; -import std::arc; +use std::arc; fn main() { let x = ~arc::RWARC(1); let mut y = None; 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 2b28172e3fd..2bb5f7d59d9 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 @@ -1,6 +1,6 @@ // error-pattern: reference is not valid outside of its lifetime use std; -import std::arc; +use std::arc; fn main() { let x = ~arc::RWARC(1); let mut y = None; 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 7aa97d7d1ee..fe270ea437e 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 @@ -1,6 +1,6 @@ // error-pattern: reference is not valid outside of its lifetime use std; -import std::arc; +use std::arc; fn main() { let x = ~arc::RWARC(1); let mut y = None; diff --git a/src/test/compile-fail/bad-module.rs b/src/test/compile-fail/bad-module.rs index cda91b7f904..79f12293616 100644 --- a/src/test/compile-fail/bad-module.rs +++ b/src/test/compile-fail/bad-module.rs @@ -1,4 +1,3 @@ // error-pattern: unresolved import -import thing; fn main() { let foo = thing::len(~[]); } diff --git a/src/test/compile-fail/borrowck-borrowed-uniq-rvalue.rs b/src/test/compile-fail/borrowck-borrowed-uniq-rvalue.rs index f163a677582..785929fe002 100644 --- a/src/test/compile-fail/borrowck-borrowed-uniq-rvalue.rs +++ b/src/test/compile-fail/borrowck-borrowed-uniq-rvalue.rs @@ -1,7 +1,7 @@ //buggy.rs use std; -import std::map::hashmap; -import std::map; +use std::map::hashmap; +use std::map; fn main() { let buggy_map :hashmap<uint, &uint> = diff --git a/src/test/compile-fail/export-import.rs b/src/test/compile-fail/export-import.rs index f010abd6a16..6c9f8d15698 100644 --- a/src/test/compile-fail/export-import.rs +++ b/src/test/compile-fail/export-import.rs @@ -1,6 +1,6 @@ // error-pattern: import -import m::unexported; +use m::unexported; mod m { export exported; diff --git a/src/test/compile-fail/for-loop-decl.rs b/src/test/compile-fail/for-loop-decl.rs index c2fdd5a8fdb..e14e1fdc7ef 100644 --- a/src/test/compile-fail/for-loop-decl.rs +++ b/src/test/compile-fail/for-loop-decl.rs @@ -1,7 +1,7 @@ // error-pattern: mismatched types use std; -import std::map::hashmap; -import std::bitv; +use std::map::hashmap; +use std::bitv; type fn_info = {vars: hashmap<uint, var_info>}; type var_info = {a: uint, b: uint}; diff --git a/src/test/compile-fail/fully-qualified-type-name4.rs b/src/test/compile-fail/fully-qualified-type-name4.rs index 5ef4cc9fe73..891be7cfbfc 100644 --- a/src/test/compile-fail/fully-qualified-type-name4.rs +++ b/src/test/compile-fail/fully-qualified-type-name4.rs @@ -1,6 +1,6 @@ // Test that we use fully-qualified type names in error messages. -import core::task::Task; +use core::task::Task; fn bar(x: uint) -> Task { return x; diff --git a/src/test/compile-fail/import-from-missing.rs b/src/test/compile-fail/import-from-missing.rs index 89d859edda3..bd3a35ad280 100644 --- a/src/test/compile-fail/import-from-missing.rs +++ b/src/test/compile-fail/import-from-missing.rs @@ -1,6 +1,6 @@ // error-pattern:unresolved // xfail-test -import spam::{ham, eggs}; +use spam::{ham, eggs}; mod spam { fn ham() { } diff --git a/src/test/compile-fail/import-from-path.rs b/src/test/compile-fail/import-from-path.rs index 0372d35ce8d..690bedeaac1 100644 --- a/src/test/compile-fail/import-from-path.rs +++ b/src/test/compile-fail/import-from-path.rs @@ -1,2 +1,2 @@ // error-pattern:expected -import foo::{bar}::baz \ No newline at end of file +use foo::{bar}::baz \ No newline at end of file diff --git a/src/test/compile-fail/import-from-rename.rs b/src/test/compile-fail/import-from-rename.rs index 6874a672e74..c72d9fda4e5 100644 --- a/src/test/compile-fail/import-from-rename.rs +++ b/src/test/compile-fail/import-from-rename.rs @@ -1,6 +1,6 @@ // error-pattern:expected -import baz = foo::{bar}; +use baz = foo::{bar}; mod foo { fn bar() {} diff --git a/src/test/compile-fail/import-glob-0.rs b/src/test/compile-fail/import-glob-0.rs index 93ad7dcf975..e9b485e4c6c 100644 --- a/src/test/compile-fail/import-glob-0.rs +++ b/src/test/compile-fail/import-glob-0.rs @@ -1,6 +1,6 @@ // error-pattern: unresolved name -import module_of_many_things::*; +use module_of_many_things::*; mod module_of_many_things { export f1; diff --git a/src/test/compile-fail/import-glob-export.rs b/src/test/compile-fail/import-glob-export.rs index 3965ad5fc4d..067caab3542 100644 --- a/src/test/compile-fail/import-glob-export.rs +++ b/src/test/compile-fail/import-glob-export.rs @@ -1,7 +1,7 @@ // error-pattern:unresolved name -import m1::*; +use m1::*; mod m1 { export f1; diff --git a/src/test/compile-fail/import-glob-path.rs b/src/test/compile-fail/import-glob-path.rs index e8cfa388574..9072fe0a659 100644 --- a/src/test/compile-fail/import-glob-path.rs +++ b/src/test/compile-fail/import-glob-path.rs @@ -1,2 +1,2 @@ // error-pattern:expected -import foo::*::bar \ No newline at end of file +use foo::*::bar \ No newline at end of file diff --git a/src/test/compile-fail/import-glob-rename.rs b/src/test/compile-fail/import-glob-rename.rs index 7ca92bad62d..3fd927d7e64 100644 --- a/src/test/compile-fail/import-glob-rename.rs +++ b/src/test/compile-fail/import-glob-rename.rs @@ -1,6 +1,6 @@ // error-pattern:expected -import baz = foo::*; +use baz = foo::*; mod foo { fn bar() {} diff --git a/src/test/compile-fail/import-loop.rs b/src/test/compile-fail/import-loop.rs index ae1f1a7f36e..0b263f23087 100644 --- a/src/test/compile-fail/import-loop.rs +++ b/src/test/compile-fail/import-loop.rs @@ -1,6 +1,6 @@ // error-pattern:import -import y::x; +use y::x; mod y { import x; diff --git a/src/test/compile-fail/import.rs b/src/test/compile-fail/import.rs index f06ff498fcc..14f23dec5f3 100644 --- a/src/test/compile-fail/import.rs +++ b/src/test/compile-fail/import.rs @@ -1,7 +1,7 @@ // xfail-test // error-pattern: unresolved -import zed::bar; -import zed::baz; +use zed::bar; +use zed::baz; mod zed { fn bar() { debug!("bar"); } } diff --git a/src/test/compile-fail/import2.rs b/src/test/compile-fail/import2.rs index 75493f2a037..ab9ea6b26df 100644 --- a/src/test/compile-fail/import2.rs +++ b/src/test/compile-fail/import2.rs @@ -1,5 +1,5 @@ // error-pattern: unresolved -import baz::zed::bar; +use baz::zed::bar; mod baz { } mod zed { fn bar() { debug!("bar3"); } diff --git a/src/test/compile-fail/import3.rs b/src/test/compile-fail/import3.rs index b825901f4a6..ad31d356665 100644 --- a/src/test/compile-fail/import3.rs +++ b/src/test/compile-fail/import3.rs @@ -1,4 +1,4 @@ // error-pattern: unresolved -import main::bar; +use main::bar; fn main(args: ~[str]) { debug!("foo"); } diff --git a/src/test/compile-fail/issue-1697.rs b/src/test/compile-fail/issue-1697.rs index 4ceaa35fca2..0f228519a38 100644 --- a/src/test/compile-fail/issue-1697.rs +++ b/src/test/compile-fail/issue-1697.rs @@ -1,7 +1,7 @@ // xfail-test // Testing that we don't fail abnormally after hitting the errors -import unresolved::*; //~ ERROR unresolved modulename +use unresolved::*; //~ ERROR unresolved modulename //~^ ERROR unresolved does not name a module fn main() { diff --git a/src/test/compile-fail/issue-2123.rs b/src/test/compile-fail/issue-2123.rs index ac23e684af5..843fd2b14eb 100644 --- a/src/test/compile-fail/issue-2123.rs +++ b/src/test/compile-fail/issue-2123.rs @@ -1,6 +1,6 @@ // xfail-test // error-pattern:unresolved import: m::f -import x = m::f; +use x = m::f; mod m { } diff --git a/src/test/compile-fail/issue-2590.rs b/src/test/compile-fail/issue-2590.rs index ffbc7a3018b..635fa059999 100644 --- a/src/test/compile-fail/issue-2590.rs +++ b/src/test/compile-fail/issue-2590.rs @@ -1,4 +1,4 @@ -import dvec::DVec; +use dvec::DVec; type parser = { tokens: DVec<int>, diff --git a/src/test/compile-fail/issue-2937.rs b/src/test/compile-fail/issue-2937.rs index b4e188d9740..c923d1d2dbe 100644 --- a/src/test/compile-fail/issue-2937.rs +++ b/src/test/compile-fail/issue-2937.rs @@ -1,5 +1,5 @@ // error-pattern:failed to resolve imports -import x = m::f; +use x = m::f; mod m { } diff --git a/src/test/compile-fail/issue-511.rs b/src/test/compile-fail/issue-511.rs index c7e49c42b51..b6dc425cf40 100644 --- a/src/test/compile-fail/issue-511.rs +++ b/src/test/compile-fail/issue-511.rs @@ -1,6 +1,5 @@ use std; -import option; -import cmp::Eq; +use cmp::Eq; fn f<T:Eq>(&o: Option<T>) { assert o == option::None; diff --git a/src/test/compile-fail/map-types.rs b/src/test/compile-fail/map-types.rs index 7a9472f49b4..0a714b12847 100644 --- a/src/test/compile-fail/map-types.rs +++ b/src/test/compile-fail/map-types.rs @@ -1,7 +1,7 @@ use std; -import std::map; -import std::map::hashmap; -import std::map::map; +use std::map; +use std::map::hashmap; +use std::map::map; // Test that trait types printed in error msgs include the type arguments. diff --git a/src/test/compile-fail/name-clash-nullary.rs b/src/test/compile-fail/name-clash-nullary.rs index 3dad39eb1f8..8a437246f10 100644 --- a/src/test/compile-fail/name-clash-nullary.rs +++ b/src/test/compile-fail/name-clash-nullary.rs @@ -1,5 +1,5 @@ // error-pattern:declaration of `None` shadows -import option::*; +use option::*; fn main() { let None: int = 42; diff --git a/src/test/compile-fail/no-capture-arc.rs b/src/test/compile-fail/no-capture-arc.rs index 606d6e19950..cc8340cd2c3 100644 --- a/src/test/compile-fail/no-capture-arc.rs +++ b/src/test/compile-fail/no-capture-arc.rs @@ -1,8 +1,8 @@ // error-pattern: copying a noncopyable value use std; -import std::arc; -import comm::*; +use std::arc; +use comm::*; fn main() { let v = ~[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]; diff --git a/src/test/compile-fail/no-reuse-move-arc.rs b/src/test/compile-fail/no-reuse-move-arc.rs index dcdd57c898b..688bb65c5cf 100644 --- a/src/test/compile-fail/no-reuse-move-arc.rs +++ b/src/test/compile-fail/no-reuse-move-arc.rs @@ -1,6 +1,6 @@ use std; -import std::arc; -import comm::*; +use std::arc; +use comm::*; fn main() { let v = ~[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]; diff --git a/src/test/compile-fail/pattern-tyvar-2.rs b/src/test/compile-fail/pattern-tyvar-2.rs index 6bf0f16cc33..9de827c7687 100644 --- a/src/test/compile-fail/pattern-tyvar-2.rs +++ b/src/test/compile-fail/pattern-tyvar-2.rs @@ -1,8 +1,7 @@ // -*- rust -*- use std; -import option; -import option::Some; +use option::Some; // error-pattern: mismatched types diff --git a/src/test/compile-fail/pattern-tyvar.rs b/src/test/compile-fail/pattern-tyvar.rs index 3bf006a5840..709ed70e11c 100644 --- a/src/test/compile-fail/pattern-tyvar.rs +++ b/src/test/compile-fail/pattern-tyvar.rs @@ -1,7 +1,6 @@ // -*- rust -*- use std; -import option; -import option::Some; +use option::Some; // error-pattern: mismatched types diff --git a/src/test/compile-fail/private-method-cross-crate.rs b/src/test/compile-fail/private-method-cross-crate.rs index f54a0ffc068..3cf5e5da75a 100644 --- a/src/test/compile-fail/private-method-cross-crate.rs +++ b/src/test/compile-fail/private-method-cross-crate.rs @@ -2,7 +2,7 @@ // xfail-fast // aux-build:cci_class_5.rs use cci_class_5; -import cci_class_5::kitties::*; +use cci_class_5::kitties::*; fn main() { let nyan : cat = cat(52u, 99); 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 c40b04004b4..077043462b1 100644 --- a/src/test/compile-fail/private-struct-field-cross-crate.rs +++ b/src/test/compile-fail/private-struct-field-cross-crate.rs @@ -1,7 +1,7 @@ // xfail-fast // aux-build:cci_class.rs use cci_class; -import cci_class::kitties::*; +use cci_class::kitties::*; fn main() { let nyan : cat = cat(52u, 99); diff --git a/src/test/compile-fail/qquote-1.rs b/src/test/compile-fail/qquote-1.rs index eb6a52ce64c..8f2fc3cf7b1 100644 --- a/src/test/compile-fail/qquote-1.rs +++ b/src/test/compile-fail/qquote-1.rs @@ -3,13 +3,13 @@ use std; use syntax; -import io::*; +use io::*; -import syntax::diagnostic; -import syntax::ast; -import syntax::codemap; -import syntax::parse; -import syntax::print::*; +use syntax::diagnostic; +use syntax::ast; +use syntax::codemap; +use syntax::parse; +use syntax::print::*; fn new_parse_sess() -> parse::parse_sess { fail; diff --git a/src/test/compile-fail/qquote-2.rs b/src/test/compile-fail/qquote-2.rs index 8e9edb54613..8a12b86045c 100644 --- a/src/test/compile-fail/qquote-2.rs +++ b/src/test/compile-fail/qquote-2.rs @@ -3,13 +3,13 @@ use std; use syntax; -import std::io::*; +use std::io::*; -import syntax::diagnostic; -import syntax::ast; -import syntax::codemap; -import syntax::parse::parser; -import syntax::print::*; +use syntax::diagnostic; +use syntax::ast; +use syntax::codemap; +use syntax::parse::parser; +use syntax::print::*; fn new_parse_sess() -> parser::parse_sess { fail; diff --git a/src/test/compile-fail/spawn-non-nil-fn.rs b/src/test/compile-fail/spawn-non-nil-fn.rs index 5394fca6b3b..0784c5d7f6e 100644 --- a/src/test/compile-fail/spawn-non-nil-fn.rs +++ b/src/test/compile-fail/spawn-non-nil-fn.rs @@ -1,6 +1,5 @@ // error-pattern: mismatched types use std; -import task; fn main() { task::spawn(fn~() -> int { 10 }); } diff --git a/src/test/compile-fail/sync-cond-shouldnt-escape.rs b/src/test/compile-fail/sync-cond-shouldnt-escape.rs index 704d1a2e443..7c916000e78 100644 --- a/src/test/compile-fail/sync-cond-shouldnt-escape.rs +++ b/src/test/compile-fail/sync-cond-shouldnt-escape.rs @@ -1,6 +1,6 @@ // error-pattern: reference is not valid outside of its lifetime use std; -import std::sync; +use std::sync; fn main() { let m = ~sync::Mutex(); 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 c64c75f8040..2bebf03bf2e 100644 --- a/src/test/compile-fail/sync-rwlock-cond-shouldnt-escape.rs +++ b/src/test/compile-fail/sync-rwlock-cond-shouldnt-escape.rs @@ -1,6 +1,6 @@ // error-pattern: reference is not valid outside of its lifetime use std; -import std::sync; +use std::sync; fn main() { let x = ~sync::RWlock(); let mut y = None; 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 373c2f80efa..3729ab29194 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 @@ -1,6 +1,6 @@ // error-pattern: cannot infer an appropriate lifetime use std; -import std::sync; +use std::sync; fn main() { let x = ~sync::RWlock(); let mut y = None; 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 79aff5f3a55..7adf9862bc2 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 @@ -1,6 +1,6 @@ // error-pattern: reference is not valid outside of its lifetime use std; -import std::sync; +use std::sync; fn main() { let x = ~sync::RWlock(); let mut y = None; 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 fde9656ca81..7e218e58c5a 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 @@ -1,6 +1,6 @@ // error-pattern: reference is not valid outside of its lifetime use std; -import std::sync; +use std::sync; fn main() { let x = ~sync::RWlock(); let mut y = None; diff --git a/src/test/compile-fail/unused-imports-warn.rs b/src/test/compile-fail/unused-imports-warn.rs index be716bf8804..6130bf38d7c 100644 --- a/src/test/compile-fail/unused-imports-warn.rs +++ b/src/test/compile-fail/unused-imports-warn.rs @@ -1,6 +1,6 @@ // error-pattern:unused import // compile-flags:-W unused-imports -import cal = bar::c::cc; +use cal = bar::c::cc; mod foo { type point = {x: int, y: int}; diff --git a/src/test/compile-fail/view-items-at-top.rs b/src/test/compile-fail/view-items-at-top.rs index e22c71af267..2baa3c2e210 100644 --- a/src/test/compile-fail/view-items-at-top.rs +++ b/src/test/compile-fail/view-items-at-top.rs @@ -5,7 +5,7 @@ use std; fn f() { } -import std::net; //~ ERROR view items must be declared at the top +use std::net; //~ ERROR view items must be declared at the top fn main() { } |
