Merge pull request #425 from solson/rustup

Rustup

.travis.yml

@@ -1,32 +1,32 @@
 language: rust
 cache: cargo
+rust:
+- nightly
 
 os:
-- osx
 - linux
+- osx
 
-rust:
-- nightly
 before_script:
 # mac os weirdness (https://github.com/travis-ci/travis-ci/issues/6307)
 - curl -sSL https://rvm.io/mpapis.asc | gpg --import -
 - rvm get stable
 # in a cronjob, use latest (not pinned) nightly
 - if [ "$TRAVIS_EVENT_TYPE" = cron ]; then rustup override set nightly; fi
-# actual travis code
+# prepare
 - export PATH=$HOME/.local/bin:$PATH
 - rustup target add i686-unknown-linux-gnu
 - rustup target add i686-pc-windows-gnu
 - rustup target add i686-pc-windows-msvc
 - rustup component add rust-src
 - cargo install xargo || echo "skipping xargo install"
-- export RUST_SYSROOT=$HOME/rust
+
 script:
 - set -e
 - |
   # Test and install plain miri
   cargo build --release --all-features &&
-  RUST_BACKTRACE=1 cargo test --release --all-features --all &&
+  cargo test --release --all-features &&
   cargo install --all-features --force
 - |
   # test that the rustc_tests binary compiles
@@ -55,7 +55,8 @@ script:
   cd ..
 - |
   # and run all tests with full mir
-  cargo test --release
+  cargo test --release --all-features
+
 notifications:
   email:
     on_success: never

appveyor.yml

@@ -26,12 +26,12 @@ install:
     - cd xargo
     - set RUSTFLAGS=-Zalways-encode-mir -Zmir-emit-validate=1
     - xargo build
-    - set RUSTFLAGS=
     - cd ..
 
 build: false
 
 test_script:
+    - set RUSTFLAGS=-g
     - set RUST_BACKTRACE=1
     - cargo build --release
     - cargo test --release

rust-toolchain

@@ -1 +1 @@
-nightly-2018-08-03
+nightly-2018-08-14

rustc_tests/src/main.rs

@@ -2,6 +2,7 @@
 extern crate miri;
 extern crate getopts;
 extern crate rustc;
+extern crate rustc_metadata;
 extern crate rustc_driver;
 extern crate rustc_errors;
 extern crate rustc_codegen_utils;
@@ -14,7 +15,7 @@ use std::io;
 
 
 use rustc::session::Session;
-use rustc::middle::cstore::CrateStore;
+use rustc_metadata::cstore::CStore;
 use rustc_driver::{Compilation, CompilerCalls, RustcDefaultCalls};
 use rustc_driver::driver::{CompileState, CompileController};
 use rustc::session::config::{self, Input, ErrorOutputType};
@@ -56,7 +57,7 @@ impl<'a> CompilerCalls<'a> for MiriCompilerCalls {
         trans: &CodegenBackend,
         matches: &getopts::Matches,
         sess: &Session,
-        cstore: &CrateStore,
+        cstore: &CStore,
         input: &Input,
         odir: &Option<PathBuf>,
         ofile: &Option<PathBuf>,

src/bin/miri.rs

@@ -3,6 +3,7 @@
 extern crate getopts;
 extern crate miri;
 extern crate rustc;
+extern crate rustc_metadata;
 extern crate rustc_driver;
 extern crate rustc_errors;
 extern crate rustc_codegen_utils;
@@ -12,7 +13,7 @@ extern crate syntax;
 extern crate log;
 
 use rustc::session::Session;
-use rustc::middle::cstore::CrateStore;
+use rustc_metadata::cstore::CStore;
 use rustc_driver::{Compilation, CompilerCalls, RustcDefaultCalls};
 use rustc_driver::driver::{CompileState, CompileController};
 use rustc::session::config::{self, Input, ErrorOutputType};
@@ -70,7 +71,7 @@ impl<'a> CompilerCalls<'a> for MiriCompilerCalls {
         codegen_backend: &CodegenBackend,
         matches: &getopts::Matches,
         sess: &Session,
-        cstore: &CrateStore,
+        cstore: &CStore,
         input: &Input,
         odir: &Option<PathBuf>,
         ofile: &Option<PathBuf>,