Skip to content

Commit 15d9acc

Browse files
pcwaltonpnkfelix
authored andcommitted
librustdoc: Fix librustdoc for the Vec<T> change.
1 parent 43c0724 commit 15d9acc

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

src/librustdoc/clean.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ impl Clean<ExternalCrate> for cstore::crate_metadata {
110110
ExternalCrate {
111111
name: self.name.to_owned(),
112112
attrs: decoder::get_crate_attributes(self.data()).clean()
113+
.move_iter()
114+
.collect(),
113115
}
114116
}
115117
}

src/librustdoc/core.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ fn get_ast_and_resolve(cpath: &Path,
5353
let sessopts = @driver::session::Options {
5454
maybe_sysroot: Some(@os::self_exe_path().unwrap().dir_path()),
5555
addl_lib_search_paths: @RefCell::new(libs),
56-
crate_types: ~[driver::session::CrateTypeDylib],
56+
crate_types: vec!(driver::session::CrateTypeDylib),
5757
.. (*rustc::driver::session::basic_options()).clone()
5858
};
5959

src/librustdoc/test.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ pub fn run(input: &str, matches: &getopts::Matches) -> int {
4444
let sessopts = @session::Options {
4545
maybe_sysroot: Some(@os::self_exe_path().unwrap().dir_path()),
4646
addl_lib_search_paths: libs,
47-
crate_types: ~[session::CrateTypeDylib],
47+
crate_types: vec!(session::CrateTypeDylib),
4848
.. (*session::basic_options()).clone()
4949
};
5050

@@ -106,8 +106,8 @@ fn runtest(test: &str, cratename: &str, libs: HashSet<Path>, should_fail: bool)
106106
let sessopts = @session::Options {
107107
maybe_sysroot: Some(@os::self_exe_path().unwrap().dir_path()),
108108
addl_lib_search_paths: @RefCell::new(libs),
109-
crate_types: ~[session::CrateTypeExecutable],
110-
output_types: ~[link::OutputTypeExe],
109+
crate_types: vec!(session::CrateTypeExecutable),
110+
output_types: vec!(link::OutputTypeExe),
111111
cg: session::CodegenOptions {
112112
prefer_dynamic: true,
113113
.. session::basic_codegen_options()

0 commit comments

Comments
 (0)