Skip to content

Commit a0ffa66

Browse files
committed
Temporarily bypass needs_finalizer
Also remove `NoFinalize` from tuple implemenations as this can result in cyclic trait lookups in trait resolution and cause an ICE. See issue rust-lang#52843
1 parent 434e3b7 commit a0ffa66

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

compiler/rustc_middle/src/ty/util.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1257,7 +1257,7 @@ impl<'tcx> Ty<'tcx> {
12571257
// This doesn't depend on regions, so try to minimize distinct
12581258
// query keys used.
12591259
let erased = tcx.normalize_erasing_regions(param_env, query_ty);
1260-
tcx.needs_finalizer_raw(param_env.and(erased))
1260+
tcx.needs_drop_raw(param_env.and(erased))
12611261
}
12621262
}
12631263
}

library/core/src/tuple.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// See src/libstd/primitive_docs.rs for documentation.
22

33
use crate::cmp::Ordering::{self, *};
4-
use crate::gc::NoFinalize;
54

65
// Recursive macro for implementing n-ary tuple functions and operations
76
//

0 commit comments

Comments
 (0)