diff --git a/src/librustdoc/clean.rs b/src/librustdoc/clean.rs
index efd0f046dc8..f26977e211c 100644
--- a/src/librustdoc/clean.rs
+++ b/src/librustdoc/clean.rs
@@ -110,6 +110,8 @@ impl Clean<ExternalCrate> for cstore::crate_metadata {
         ExternalCrate {
             name: self.name.to_owned(),
             attrs: decoder::get_crate_attributes(self.data()).clean()
+                                                             .move_iter()
+                                                             .collect(),
         }
     }
 }
diff --git a/src/librustdoc/core.rs b/src/librustdoc/core.rs
index 26650d22fe9..58bed8a9df9 100644
--- a/src/librustdoc/core.rs
+++ b/src/librustdoc/core.rs
@@ -53,7 +53,7 @@ fn get_ast_and_resolve(cpath: &Path,
     let sessopts = @driver::session::Options {
         maybe_sysroot: Some(@os::self_exe_path().unwrap().dir_path()),
         addl_lib_search_paths: @RefCell::new(libs),
-        crate_types: ~[driver::session::CrateTypeDylib],
+        crate_types: vec!(driver::session::CrateTypeDylib),
         .. (*rustc::driver::session::basic_options()).clone()
     };
 
diff --git a/src/librustdoc/test.rs b/src/librustdoc/test.rs
index f97dd98e457..f34ce016f28 100644
--- a/src/librustdoc/test.rs
+++ b/src/librustdoc/test.rs
@@ -44,7 +44,7 @@ pub fn run(input: &str, matches: &getopts::Matches) -> int {
     let sessopts = @session::Options {
         maybe_sysroot: Some(@os::self_exe_path().unwrap().dir_path()),
         addl_lib_search_paths: libs,
-        crate_types: ~[session::CrateTypeDylib],
+        crate_types: vec!(session::CrateTypeDylib),
         .. (*session::basic_options()).clone()
     };
 
@@ -106,8 +106,8 @@ fn runtest(test: &str, cratename: &str, libs: HashSet<Path>, should_fail: bool)
     let sessopts = @session::Options {
         maybe_sysroot: Some(@os::self_exe_path().unwrap().dir_path()),
         addl_lib_search_paths: @RefCell::new(libs),
-        crate_types: ~[session::CrateTypeExecutable],
-        output_types: ~[link::OutputTypeExe],
+        crate_types: vec!(session::CrateTypeExecutable),
+        output_types: vec!(link::OutputTypeExe),
         cg: session::CodegenOptions {
             prefer_dynamic: true,
             .. session::basic_codegen_options()