rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

remove FIXME(#30046) and infer moves on pattern matching

Browse Source
This commit is contained in:
Niv Kaminer
2018-03-17 01:00:40 +02:00
parent 622c44510f
commit 69d12a2b97
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/librustc_mir/build/block.rs
View File

@@ -117,10 +117,9 @@ impl<'a, 'gcx, 'tcx> Builder<'a, 'gcx, 'tcx> {
// Evaluate the initializer, if present. // Evaluate the initializer, if present.
if let Some(init) = initializer { if let Some(init) = initializer {
unpack!(block = this.in_opt_scope( unpack!(block = this.in_opt_scope(
opt_destruction_scope.map(|de|(de, source_info)), block, move |this| { opt_destruction_scope.map(|de|(de, source_info)), block, |this| {
let scope = (init_scope, source_info); let scope = (init_scope, source_info);
this.in_scope(scope, lint_level, block, move |this| { this.in_scope(scope, lint_level, block, |this| {
// FIXME #30046 ^~~~
this.expr_into_pattern(block, pattern, init) this.expr_into_pattern(block, pattern, init)
}) })
})); }));

1
src/librustc_typeck/check/mod.rs
View File

@@ -2879,7 +2879,6 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
// just trying to get hints here. // just trying to get hints here.
self.save_and_restore_in_snapshot_flag(|_| { self.save_and_restore_in_snapshot_flag(|_| {
let mut fulfill = FulfillmentContext::new(); let mut fulfill = FulfillmentContext::new();
let ok = ok; // FIXME(#30046)
for obligation in ok.obligations { for obligation in ok.obligations {
fulfill.register_predicate_obligation(self, obligation); fulfill.register_predicate_obligation(self, obligation);
} }