Merge pull request rust-lang#268 from oli-obk/upstream

Split up miri into the librustc_mir and bin parts

Author: oli-obk

.travis.yml

@@ -15,10 +15,9 @@ script:
   xargo/build.sh
 - |
   # Test plain miri
-  cd src/librustc_mir/ && cargo build &&
+  cargo build &&
   cargo test &&
-  cargo install &&
-  cd ../..
+  cargo install
 - |
   # Test cargo miri
   cd cargo-miri-test &&
@@ -27,7 +26,7 @@ script:
   cd ..
 - |
   # and run all tests with full mir
-  cd src/librustc_mir/ && MIRI_SYSROOT=~/.xargo/HOST cargo test && cd ../..
+  MIRI_SYSROOT=~/.xargo/HOST cargo test
 notifications:
   email:
     on_success: never

Cargo.lock

@@ -0,0 +1,37 @@
+[package]
+authors = ["Scott Olson <[email protected]>"]
+description = "An experimental interpreter for Rust MIR."
+license = "MIT/Apache-2.0"
+name = "miri"
+repository = "https://github.com/solson/miri"
+version = "0.1.0"
+
+[[bin]]
+doc = false
+name = "miri"
+test = false
+path = "miri/bin/miri.rs"
+
+[[bin]]
+doc = false
+name = "cargo-miri"
+test = false
+path = "miri/bin/cargo-miri.rs"
+
+[lib]
+test = false
+path = "miri/lib.rs"
+
+[dependencies]
+byteorder = { version = "1.1", features = ["i128"]}
+env_logger = "0.4.3"
+log = "0.3.6"
+log_settings = "0.1.1"
+cargo_metadata = "0.2"
+rustc_miri = { path = "src/librustc_mir" }
+
+[dev-dependencies]
+compiletest_rs = "0.2.6"
+
+[workspace]
+exclude = ["xargo", "cargo-miri-test"]