From 8dd281d0309378546157cbabb295b4cbd373468f Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Sun, 28 Oct 2018 12:32:12 +0100
Subject: [PATCH 1/2] rustup

---
 rust-version | 2 +-
 src/lib.rs   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rust-version b/rust-version
index cc0787f877..21908d0bc4 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-nightly-2018-10-22
+nightly-2018-10-28
diff --git a/src/lib.rs b/src/lib.rs
index ed23eef3f5..a93a48cb09 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -181,7 +181,7 @@ pub fn eval_main<'a, 'tcx: 'a>(
                 let e = e.to_string();
                 let msg = format!("constant evaluation error: {}", e);
                 let mut err = struct_error(ecx.tcx.tcx.at(span), msg.as_str());
-                let (frames, span) = ecx.generate_stacktrace(None);
+                let frames = ecx.generate_stacktrace(None);
                 err.span_label(span, e);
                 for FrameInfo { span, location, .. } in frames {
                     err.span_note(span, &format!("inside call to `{}`", location));

From 8f6c7100e349463de8dc6c32490527607dd72400 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Sun, 28 Oct 2018 12:40:50 +0100
Subject: [PATCH 2/2] pin to a git version of compiletest until a new release
 with the fix is out

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index f79609c763..815a5468c3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -45,5 +45,5 @@ cargo_miri = ["cargo_metadata"]
 rustc_tests = []
 
 [dev-dependencies]
-compiletest_rs = { version = "0.3.12", features = ["tmp"] }
+compiletest_rs = { git = "https://github.com/laumann/compiletest-rs", rev = "2ebb5216", features = ["tmp"] }
 colored = "1.6"