user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #498 from RalfJung/rustup

Browse source 
Update for generate_stacktrace return type change
This commit is contained in:
Ralf Jung 2018-10-29 10:04:41 +01:00 • committed by GitHub
commit f86c706df2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -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"

2
rust-version
View file

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

2
src/lib.rs
View file

@ -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));