Merge remote-tracking branch 'origin/master' into rustup

Author: RalfJung

Cargo.toml

@@ -45,5 +45,5 @@ cargo_miri = ["cargo_metadata"]
 rustc_tests = []
 
 [dev-dependencies]
-compiletest_rs = { version = "0.3.12", features = ["tmp"] }
+compiletest_rs = { version = "0.3.16", features = ["tmp"] }
 colored = "1.6"

rust-version

@@ -1 +1 @@
-nightly-2018-10-22
+nightly-2018-10-29

src/lib.rs

@@ -185,7 +185,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));