diff options
| author | bors <bors@rust-lang.org> | 2018-10-04 16:34:27 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-10-04 16:34:27 +0000 |
| commit | a57f1c9c955177e2a7563dd59f9e3a70458e2be1 (patch) | |
| tree | f09383537c54a27ecb4e0899738373ffedb3725e /src/librustc/ich | |
| parent | 5de52817c43fcb767ab3c7ecf051872cad6d0df2 (diff) | |
| parent | bc4f9b848d745022ededdfaa3099158a766e8faa (diff) | |
| download | rust-a57f1c9c955177e2a7563dd59f9e3a70458e2be1.tar.gz rust-a57f1c9c955177e2a7563dd59f9e3a70458e2be1.zip | |
Auto merge of #54666 - matthewjasper:mir-function-spans, r=pnkfelix
[NLL] Improve "borrow later used here" messages * In the case of two conflicting borrows, the later used message says which borrow it's referring to * If the later use is a function call (from the users point of view) say that the later use is for the call. Point just to the function. r? @pnkfelix Closes #48643
Diffstat (limited to 'src/librustc/ich')
| -rw-r--r-- | src/librustc/ich/impls_mir.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/librustc/ich/impls_mir.rs b/src/librustc/ich/impls_mir.rs index ec54613d1db..656f5795e18 100644 --- a/src/librustc/ich/impls_mir.rs +++ b/src/librustc/ich/impls_mir.rs @@ -194,11 +194,13 @@ for mir::TerminatorKind<'gcx> { mir::TerminatorKind::Call { ref func, ref args, ref destination, - cleanup } => { + cleanup, + from_hir_call, } => { func.hash_stable(hcx, hasher); args.hash_stable(hcx, hasher); destination.hash_stable(hcx, hasher); cleanup.hash_stable(hcx, hasher); + from_hir_call.hash_stable(hcx, hasher); } mir::TerminatorKind::Assert { ref cond, expected, |