Merge pull request #327 from RalfJung/backtrace

update backtrace to newly released version
rust-lang · Sep 4, 2017 · ff75da2 · ff75da2
2 parents 0002b5a + 41be917
commit ff75da2
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 22 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,7 +16,7 @@ script:
   xargo/build.sh
 - |
   # Test plain miri
-  cargo build --release --features "cargo_miri" &&
+  cargo build --locked --release --features "cargo_miri" &&
   cargo test --release --all &&
   cargo install --features "cargo_miri"
 - |
@@ -31,7 +31,7 @@ script:
 - |
   # test that the rustc_tests binary compiles
   cd rustc_tests &&
-  cargo build --release &&
+  cargo build --locked --release &&
   cd ..
 notifications:
   email:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/rustc_tests/Cargo.lock b/rustc_tests/Cargo.lock
diff --git a/src/librustc_mir/Cargo.toml b/src/librustc_mir/Cargo.toml
@@ -16,4 +16,4 @@ log = "0.3.6"
 log_settings = "0.1.1"
 lazy_static = "0.2.8"
 regex = "0.2.2"
-backtrace = { version = "0.3", git = "https://github.com/alexcrichton/backtrace-rs" }
+backtrace = "0.3.3"