about summary refs log tree commit diff
path: root/src/rustdoc
diff options
context:
space:
mode:
Diffstat (limited to 'src/rustdoc')
-rw-r--r--src/rustdoc/astsrv.rs4
-rw-r--r--src/rustdoc/attr_parser.rs10
-rw-r--r--src/rustdoc/config.rs2
-rw-r--r--src/rustdoc/markdown_writer.rs4
-rw-r--r--src/rustdoc/prune_hidden_pass.rs2
-rw-r--r--src/rustdoc/rustdoc.rc4
6 files changed, 13 insertions, 13 deletions
diff --git a/src/rustdoc/astsrv.rs b/src/rustdoc/astsrv.rs
index 9f32e8f4c61..cda89e3b083 100644
--- a/src/rustdoc/astsrv.rs
+++ b/src/rustdoc/astsrv.rs
@@ -104,7 +104,7 @@ fn exec<T:Send>(
 fn build_ctxt(sess: session,
               ast: @ast::crate) -> ctxt {
 
-    import rustc::front::config;
+    use rustc::front::config;
 
     let ast = config::strip_unconfigured_items(ast);
     let ast = syntax::ext::expand::expand_crate(sess.parse_sess,
@@ -201,7 +201,7 @@ fn srv_should_build_ast_map() {
 
 #[test]
 fn should_ignore_external_import_paths_that_dont_exist() {
-    let source = ~"use forble; import forble::bippy;";
+    let source = ~"use forble; use forble::bippy;";
     from_str(source, |_srv| { } )
 }
 
diff --git a/src/rustdoc/attr_parser.rs b/src/rustdoc/attr_parser.rs
index 8663e377c0d..ebb892e5212 100644
--- a/src/rustdoc/attr_parser.rs
+++ b/src/rustdoc/attr_parser.rs
@@ -21,11 +21,11 @@ type crate_attrs = {
 mod test {
 
     fn parse_attributes(source: ~str) -> ~[ast::attribute] {
-        import syntax::parse;
-        import parse::parser;
-        import parse::attr::parser_attr;
-        import syntax::codemap;
-        import syntax::diagnostic;
+        use syntax::parse;
+        use parse::parser;
+        use parse::attr::parser_attr;
+        use syntax::codemap;
+        use syntax::diagnostic;
 
         let parse_sess = syntax::parse::new_parse_sess(None);
         let parser = parse::new_parser_from_source_str(
diff --git a/src/rustdoc/config.rs b/src/rustdoc/config.rs
index b0c01025320..3e6f46dbe26 100644
--- a/src/rustdoc/config.rs
+++ b/src/rustdoc/config.rs
@@ -71,7 +71,7 @@ fn opts() -> ~[(getopts::Opt, ~str)] {
 }
 
 fn usage() {
-    import io::println;
+    use io::println;
 
     println(~"Usage: rustdoc ~[options] <cratefile>\n");
     println(~"Options:\n");
diff --git a/src/rustdoc/markdown_writer.rs b/src/rustdoc/markdown_writer.rs
index 00c80366084..5e895c73674 100644
--- a/src/rustdoc/markdown_writer.rs
+++ b/src/rustdoc/markdown_writer.rs
@@ -89,7 +89,7 @@ fn pandoc_writer(
     ];
 
     do generic_writer |markdown| {
-        import io::WriterUtil;
+        use io::WriterUtil;
 
         debug!("pandoc cmd: %s", pandoc_cmd);
         debug!("pandoc args: %s", str::connect(pandoc_args, ~" "));
@@ -255,7 +255,7 @@ mod test {
 }
 
 fn write_file(path: &Path, s: ~str) {
-    import io::WriterUtil;
+    use io::WriterUtil;
 
     match io::file_writer(path, ~[io::Create, io::Truncate]) {
       result::Ok(writer) => {
diff --git a/src/rustdoc/prune_hidden_pass.rs b/src/rustdoc/prune_hidden_pass.rs
index 292e37d93c4..9125cadd693 100644
--- a/src/rustdoc/prune_hidden_pass.rs
+++ b/src/rustdoc/prune_hidden_pass.rs
@@ -34,7 +34,7 @@ fn fold_mod(
 }
 
 fn is_hidden(srv: astsrv::srv, doc: doc::itemdoc) -> bool {
-    import syntax::ast_map;
+    use syntax::ast_map;
 
     let id = doc.id;
     do astsrv::exec(srv) |ctxt| {
diff --git a/src/rustdoc/rustdoc.rc b/src/rustdoc/rustdoc.rc
index 4129a325627..d0e073986ef 100644
--- a/src/rustdoc/rustdoc.rc
+++ b/src/rustdoc/rustdoc.rc
@@ -19,8 +19,8 @@ use std(vers = "0.4");
 use rustc(vers = "0.4");
 use syntax(vers = "0.4");
 
-import core::*;
-import std::par;
+use core::*;
+use std::par;
 
 mod config;
 mod parse;