Merge remote-tracking branch 'origin/master' into str-index-mut

Author: RalfJung

appveyor.yml renamed to .appveyor.yml

@@ -39,6 +39,7 @@ directories = { version = "1.0", optional = true }
 rustc_version = { version = "0.2.3", optional = true }
 env_logger = "0.6"
 log = "0.4"
+shell-escape = "0.1.4"
 # A noop dependency that changes in the Rust repository, it's a bit of a hack.
 # See the `src/tools/rustc-workspace-hack/README.md` file in `rust-lang/rust`
 # for more information.
@@ -55,3 +56,6 @@ rustc_tests = []
 [dev-dependencies]
 compiletest_rs = { version = "0.3.17", features = ["tmp"] }
 colored = "1.6"
+
+[profile.release]
+debug = true

Cargo.toml

@@ -48,12 +48,19 @@ Now you can run your project in Miri:
 3. If you have a binary project, you can run it through Miri using `cargo
    +nightly miri run`.
 
-When running code via `cargo miri`, the `cargo-miri` feature is set.  You can
+You can pass arguments to Miri after the first `--`, and pass arguments to the
+interpreted program or test suite after the second `--`.  For example, `cargo
++nightly miri run -- -Zmiri-disable-validation` runs the program without
+validation of basic type invariants and references.  `cargo +nightly miri test
+-- -- filter` passes `filter` to the test suite the same way `cargo test filter`
+would.
+
+When running code via `cargo miri`, the `miri` config flag is set.  You can
 use this to exclude test cases that will fail under Miri because they do things
 Miri does not support:
 
 ```rust
-#[cfg(not(feature = "cargo-miri"))]
+#[cfg(not(miri))]
 #[test]
 fn does_not_work_on_miri() {
     let x = 0u8;

README.md

@@ -4,11 +4,13 @@ extern crate rustc;
 extern crate rustc_driver;
 extern crate test;
 
-use self::miri::eval_main;
-use self::rustc_driver::{driver, Compilation};
+use rustc_driver::{driver, Compilation};
 use rustc::hir::def_id::LOCAL_CRATE;
 use std::cell::RefCell;
 use std::rc::Rc;
+
+use miri::{MiriConfig, eval_main};
+
 use crate::test::Bencher;
 
 pub struct MiriCompilerCalls<'a>(Rc<RefCell<&'a mut Bencher>>);
@@ -50,7 +52,8 @@ pub fn run(filename: &str, bencher: &mut Bencher) {
         );
 
         bencher.borrow_mut().iter(|| {
-            eval_main(tcx, entry_def_id, false);
+            let config = MiriConfig { validate: true, args: vec![] };
+            eval_main(tcx, entry_def_id, config);
         });
 
         state.session.abort_if_errors();

benches/helpers/miri_helper.rs

@@ -1 +1 @@
-nightly-2019-01-30
+nightly-2019-02-13