user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix tests & rustdoc

Browse source
This commit is contained in:
Ariel Ben-Yehuda 2015-11-25 01:23:22 +02:00 • committed by Ariel Ben-Yehuda
parent 0a8bb4c509
commit 52dd2b4c35
12 changed files with 25 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/test/run-make/execution-engine/test.rs
View file

@ -16,6 +16,7 @@ extern crate rustc;
extern crate rustc_driver;
extern crate rustc_front;
extern crate rustc_lint;
extern crate rustc_metadata;
extern crate rustc_resolve;
extern crate syntax;
@ -27,14 +28,14 @@ use std::thread::Builder;
use rustc::front::map as ast_map;
use rustc::llvm;
use rustc::metadata::cstore::{CStore, RequireDynamic};
use rustc::metadata::util::CrateStore;
use rustc::middle::cstore::{CrateStore, LinkagePreference};
use rustc::middle::ty;
use rustc::session::config::{self, basic_options, build_configuration, Input, Options};
use rustc::session::build_session;
use rustc_driver::driver;
use rustc_front::lowering::{lower_crate, LoweringContext};
use rustc_resolve::MakeGlobMap;
use rustc_metadata::cstore::CStore;
use libc::c_void;
use syntax::diagnostics::registry::Registry;
@ -240,7 +241,7 @@ fn compile_program(input: &str, sysroot: PathBuf)
let trans = driver::phase_4_translate_to_llvm(tcx, mir_map, analysis);
let crates = tcx.sess.cstore.used_crates(RequireDynamic);
let crates = tcx.sess.cstore.used_crates(LinkagePreference::RequireDynamic);
// Collect crates used in the session.
// Reverse order finds dependencies first.

3
src/test/run-make/issue-19371/foo.rs
View file

@ -13,12 +13,13 @@
extern crate rustc;
extern crate rustc_driver;
extern crate rustc_lint;
extern crate rustc_metadata;
extern crate syntax;
use rustc::metadata::cstore::CStore;
use rustc::session::{build_session, Session};
use rustc::session::config::{basic_options, build_configuration, Input, OutputType};
use rustc_driver::driver::{compile_input, CompileController};
use rustc_metadata::cstore::CStore;
use syntax::diagnostics::registry::Registry;
use syntax::parse::token;

2
src/test/run-make/libs-through-symlinks/Makefile
View file

@ -10,5 +10,5 @@ all:
mkdir -p $(TMPDIR)/outdir
$(RUSTC) foo.rs -o $(TMPDIR)/outdir/$(NAME)
ln -nsf outdir/$(NAME) $(TMPDIR)
RUST_LOG=rustc::metadata::loader $(RUSTC) bar.rs
RUST_LOG=rustc_metadata::loader $(RUSTC) bar.rs
endif