Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 15 pull requests #58666

Closed
wants to merge 60 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
eb5b096
RangeInclusive internal iteration performance improvement.
matthieu-m Feb 3, 2019
a15916b
[WIP] add better error message for partial move
clintfred Feb 5, 2019
50be479
Updated RELEASES.md for 1.33.0
Feb 6, 2019
d4c52bf
error output updated by ./x.py test --stage 1 src/test/ui --increment…
clintfred Feb 6, 2019
6c71e7d
Update RELEASES.md
Aaronepower Feb 7, 2019
fb3ae57
Update RELEASES.md
mark-i-m Feb 9, 2019
4fed67f
Fix exhaustion of inclusive range try_fold and try_rfold
matthieu-m Feb 9, 2019
73921f6
Update RELEASES.md
Centril Feb 12, 2019
8a026f1
Update RELEASES.md
Centril Feb 12, 2019
4c0a3d5
Update RELEASES.md
Centril Feb 12, 2019
ee3371e
Update RELEASES.md
Centril Feb 12, 2019
4e5eda3
compute is_partial_move outside of the move_site loop for clarity
clintfred Feb 13, 2019
a496450
Update RELEASES.md
Centril Feb 13, 2019
96fd218
check if `used_place` and `moved_place` are equal when determining if…
clintfred Feb 13, 2019
755b320
simplified conditional
clintfred Feb 13, 2019
283ffcf
Check the self-type of inherent associated constants
matthewjasper Feb 11, 2019
347a42e
SGX target: fix panic = abort
Feb 14, 2019
503e74e
Fix SECURITY_SQOS_PRESENT missing
pitdicker Feb 6, 2019
9295f49
Correct OpenOptions::security_qos_flags documentation
pitdicker Feb 6, 2019
c34aac7
help suggestion when trying to delimit string literals with directed …
pmccarter Feb 17, 2019
71cd4c8
ui test for directed quote help suggestion #58436
pmccarter Feb 17, 2019
d26bf74
Change `Token::interpolated_to_tokenstream()`.
nnethercote Feb 14, 2019
f8801f3
Remove `LazyTokenStream`.
nnethercote Feb 14, 2019
f0d8fbd
Avoid a `clone()` in `transcribe()`.
nnethercote Feb 15, 2019
82ad4f1
Make `interpolated_to_tokenstream` a method on `Nonterminal`.
nnethercote Feb 17, 2019
895a794
Remove some unnecessary `into()` calls.
nnethercote Feb 17, 2019
de05548
re-blessing error output: ./x.py test src/test/ui --stage 1 --bless
clintfred Feb 18, 2019
8e219e7
Turn duration consts into associated consts
Feb 20, 2019
2621564
Update RELEASES.md
Aaronepower Feb 20, 2019
d072510
Update RELEASES.md
Aaronepower Feb 20, 2019
02fe6a7
./x.py test src/test/ui --stage 1 --bless -i --compare-mode=nll
clintfred Feb 20, 2019
f223c03
Add examples for duration constants
Feb 20, 2019
36f18f2
Allow Self::Module to be mutated.
gabi-250 Feb 20, 2019
42d749c
Update RELEASES.md
tspiteri Feb 20, 2019
c6d24cd
Enable feature duration_constants in examples
Feb 21, 2019
8060eb4
Update RELEASES.md
Aaronepower Feb 21, 2019
0ab2aed
Update RELEASES.md
Aaronepower Feb 21, 2019
e5d1fa5
codegen and write_metadata can mutate ModuleLLvm.
gabi-250 Feb 21, 2019
9f58c5f
Optimise vec![false; N] to zero-alloc
RReverser Feb 21, 2019
bba0ea2
rustdoc: support methods on primitives in intra-doc links
tspiteri Feb 22, 2019
b5ae4d5
Don't generate minification variable if minification disabled
GuillaumeGomez Feb 22, 2019
e555854
Make target pointer-width specific variants of (very old) huge-array-…
pnkfelix Feb 22, 2019
b72ba05
Switch from error patterns to `//~ ERROR` markers.
pnkfelix Feb 22, 2019
fda51c2
Update RELEASES.md
Centril Feb 22, 2019
cc1cd83
Do not underflow after resetting unmatched braces count
estebank Feb 22, 2019
6bf3c18
Rollup merge of #58122 - matthieu-m:range_incl_perf, r=dtolnay
Centril Feb 23, 2019
8f8aa9b
Rollup merge of #58199 - clintfred:partial-move-err-msg, r=estebank
Centril Feb 23, 2019
249e103
Rollup merge of #58216 - pitdicker:sqos_flags, r=alexcrichton
Centril Feb 23, 2019
3cf56ef
Rollup merge of #58227 - Aaronepower:master, r=Centril
Centril Feb 23, 2019
d379744
Rollup merge of #58353 - matthewjasper:typeck-pattern-constants, r=ar…
Centril Feb 23, 2019
f06dd24
Rollup merge of #58453 - jethrogb:jb/sgx-panic-abort, r=nagisa
Centril Feb 23, 2019
ba9006f
Rollup merge of #58476 - nnethercote:rm-LazyTokenStream, r=petrochenkov
Centril Feb 23, 2019
cb48a98
Rollup merge of #58526 - pmccarter:master, r=estebank
Centril Feb 23, 2019
1775299
Rollup merge of #58595 - stjepang:make-duration-consts-associated, r=…
Centril Feb 23, 2019
303f231
Rollup merge of #58609 - gabi-250:mutable-refs, r=oli-obk
Centril Feb 23, 2019
f67a919
Rollup merge of #58628 - RReverser:optimise-vec-false, r=oli-obk
Centril Feb 23, 2019
7be0a38
Rollup merge of #58642 - tspiteri:intra-rustdoc-prim-method, r=Guilla…
Centril Feb 23, 2019
646d8a8
Rollup merge of #58643 - GuillaumeGomez:extra-variables, r=Manishearth
Centril Feb 23, 2019
6581a0e
Rollup merge of #58648 - pnkfelix:issue-23926-update-tests, r=nikomat…
Centril Feb 23, 2019
28faa88
Rollup merge of #58654 - estebank:underflow, r=nikomatsakis
Centril Feb 23, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/librustc_mir/borrow_check/error_reporting.rs
Original file line number Diff line number Diff line change
@@ -130,15 +130,22 @@ impl<'cx, 'gcx, 'tcx> MirBorrowckCtxt<'cx, 'gcx, 'tcx> {
);

let mut is_loop_move = false;
let mut is_partial_move = false;
let is_partial_move = move_site_vec.iter().any(|move_site| {
let move_out = self.move_data.moves[(*move_site).moi];
let moved_place = &self.move_data.move_paths[move_out.path].place;
// dbg!(moved_place);
// dbg!(used_place);
// if used_place != moved_place {
used_place.is_prefix_of(moved_place)
// } else { false }
});
for move_site in &move_site_vec {
let move_out = self.move_data.moves[(*move_site).moi];
let moved_place = &self.move_data.move_paths[move_out.path].place;

let move_spans = self.move_spans(moved_place, move_out.source);
let move_span = move_spans.args_or_use();

is_partial_move = used_place.is_prefix_of(moved_place);
let move_msg = if move_spans.for_closure() {
" into closure"
} else {