diff options
| author | bors <bors@rust-lang.org> | 2018-08-04 18:22:39 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-08-04 18:22:39 +0000 |
| commit | 94c3c340cce53396d23a20b236fa94f1d34b6df7 (patch) | |
| tree | 5e4fd9877c9ae60131d28c97f15eac835b2030d8 /src/test | |
| parent | 215bf3abd9c0eb1fd0c6cae7c92a842732dc033d (diff) | |
| parent | 0ae2aa232047e16019d1b90726ca2c397371e5aa (diff) | |
| download | rust-94c3c340cce53396d23a20b236fa94f1d34b6df7.tar.gz rust-94c3c340cce53396d23a20b236fa94f1d34b6df7.zip | |
Auto merge of #52758 - Mark-Simulacrum:session-cleanup, r=pnkfelix
Cleanup for librustc::session Some rather straightforward cleanup. Each commit mostly stands alone.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/run-make-fulldeps/hotplug_codegen_backend/the_backend.rs | 2 | ||||
| -rw-r--r-- | src/test/run-make-fulldeps/issue-19371/foo.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/test/run-make-fulldeps/hotplug_codegen_backend/the_backend.rs b/src/test/run-make-fulldeps/hotplug_codegen_backend/the_backend.rs index a3cd033f863..87d2026fe2d 100644 --- a/src/test/run-make-fulldeps/hotplug_codegen_backend/the_backend.rs +++ b/src/test/run-make-fulldeps/hotplug_codegen_backend/the_backend.rs @@ -63,7 +63,7 @@ impl CodegenBackend for TheBackend { let crate_name = ongoing_codegen.downcast::<Symbol>() .expect("in join_codegen_and_link: ongoing_codegen is not a Symbol"); for &crate_type in sess.opts.crate_types.iter() { - if crate_type != CrateType::CrateTypeRlib { + if crate_type != CrateType::Rlib { sess.fatal(&format!("Crate type is {:?}", crate_type)); } let output_name = diff --git a/src/test/run-make-fulldeps/issue-19371/foo.rs b/src/test/run-make-fulldeps/issue-19371/foo.rs index 6f5e2affdbd..d83b21e6441 100644 --- a/src/test/run-make-fulldeps/issue-19371/foo.rs +++ b/src/test/run-make-fulldeps/issue-19371/foo.rs @@ -19,7 +19,7 @@ extern crate rustc_codegen_utils; extern crate syntax; use rustc::session::{build_session, Session}; -use rustc::session::config::{basic_options, Input, Options, +use rustc::session::config::{Input, Options, OutputType, OutputTypes}; use rustc_driver::driver::{self, compile_input, CompileController}; use rustc_metadata::cstore::CStore; @@ -63,7 +63,7 @@ fn basic_sess(opts: Options) -> (Session, Rc<CStore>, Box<CodegenBackend>) { fn compile(code: String, output: PathBuf, sysroot: PathBuf) { syntax::with_globals(|| { - let mut opts = basic_options(); + let mut opts = Options::default(); opts.output_types = OutputTypes::new(&[(OutputType::Exe, None)]); opts.maybe_sysroot = Some(sysroot); if let Ok(linker) = std::env::var("RUSTC_LINKER") { |