Skip to content

Commit 69d12a2

Browse files
committed
remove FIXME(rust-lang#30046) and infer moves on pattern matching
1 parent 622c445 commit 69d12a2

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

src/librustc_mir/build/block.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,9 @@ impl<'a, 'gcx, 'tcx> Builder<'a, 'gcx, 'tcx> {
117117
// Evaluate the initializer, if present.
118118
if let Some(init) = initializer {
119119
unpack!(block = this.in_opt_scope(
120-
opt_destruction_scope.map(|de|(de, source_info)), block, move |this| {
120+
opt_destruction_scope.map(|de|(de, source_info)), block, |this| {
121121
let scope = (init_scope, source_info);
122-
this.in_scope(scope, lint_level, block, move |this| {
123-
// FIXME #30046 ^~~~
122+
this.in_scope(scope, lint_level, block, |this| {
124123
this.expr_into_pattern(block, pattern, init)
125124
})
126125
}));

src/librustc_typeck/check/mod.rs

-1
Original file line numberDiff line numberDiff line change
@@ -2879,7 +2879,6 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
28792879
// just trying to get hints here.
28802880
self.save_and_restore_in_snapshot_flag(|_| {
28812881
let mut fulfill = FulfillmentContext::new();
2882-
let ok = ok; // FIXME(#30046)
28832882
for obligation in ok.obligations {
28842883
fulfill.register_predicate_obligation(self, obligation);
28852884
}

0 commit comments

Comments
 (0)