Merge branch 'master' into oli-obk-patch-2

.travis.yml

@@ -15,9 +15,9 @@ script:
   xargo/build.sh
 - |
   # Test plain miri
-  cargo build --release &&
+  cargo build --release --features "cargo_miri" &&
   cargo test --release &&
-  cargo install
+  cargo install --features "cargo_miri"
 - |
   # Test cargo miri
   cd cargo-miri-test &&

Cargo.toml

@@ -18,6 +18,7 @@ doc = false
 name = "cargo-miri"
 test = false
 path = "miri/bin/cargo-miri.rs"
+required-features = ["cargo_miri"]
 
 [lib]
 test = false
@@ -28,9 +29,12 @@ byteorder = { version = "1.1", features = ["i128"]}
 env_logger = "0.4.3"
 log = "0.3.6"
 log_settings = "0.1.1"
-cargo_metadata = "0.2"
+cargo_metadata = { version = "0.2", optional = true }
 rustc_miri = { path = "src/librustc_mir" }
 
+[features]
+cargo_miri = ["cargo_metadata"]
+
 [dev-dependencies]
 compiletest_rs = "0.2.6"