mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

never type is const Drop

Browse Source
This commit is contained in:
Michael Goulet 2022-01-19 00:40:05 -08:00
parent ba87be05cf
commit e3f01b2b6f
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_trait_selection/src/traits/select/candidate_assembly.rs
View File

@ -932,7 +932,6 @@ fn assemble_const_drop_candidates(
| ty::Bound(..) | ty::Bound(..)
| ty::Param(_) | ty::Param(_)
| ty::Placeholder(_) | ty::Placeholder(_)
| ty::Never
| ty::Foreign(_) | ty::Foreign(_)
| ty::Projection(_) => { | ty::Projection(_) => {
// We don't know if these are `~const Drop`, at least // We don't know if these are `~const Drop`, at least
@ -951,6 +950,7 @@ fn assemble_const_drop_candidates(
| ty::Ref(..) | ty::Ref(..)
| ty::FnDef(..) | ty::FnDef(..)
| ty::FnPtr(_) | ty::FnPtr(_)
| ty::Never
| ty::Array(..) | ty::Array(..)
| ty::Slice(_) | ty::Slice(_)
| ty::Closure(..) | ty::Closure(..)

6
compiler/rustc_trait_selection/src/traits/select/confirmation.rs
View File

@ -1103,6 +1103,7 @@ fn confirm_const_drop_candidate(
let tcx = self.tcx(); let tcx = self.tcx();
let self_ty = self.infcx.shallow_resolve(obligation.self_ty()); let self_ty = self.infcx.shallow_resolve(obligation.self_ty());
// Skip binder here (*)
let nested_tys = match *self_ty.skip_binder().kind() { let nested_tys = match *self_ty.skip_binder().kind() {
ty::Bool ty::Bool
| ty::Char | ty::Char
@ -1116,7 +1117,7 @@ fn confirm_const_drop_candidate(
| ty::Ref(..) | ty::Ref(..)
| ty::FnDef(..) | ty::FnDef(..)
| ty::FnPtr(_) | ty::FnPtr(_)
| ty::Projection(_) => vec![], | ty::Never => vec![],
ty::Adt(def, substs) => def.all_fields().map(|f| f.ty(tcx, substs)).collect(), ty::Adt(def, substs) => def.all_fields().map(|f| f.ty(tcx, substs)).collect(),
@ -1138,8 +1139,8 @@ fn confirm_const_drop_candidate(
| ty::Bound(_, _) | ty::Bound(_, _)
| ty::Param(_) | ty::Param(_)
| ty::Placeholder(_) | ty::Placeholder(_)
| ty::Never
| ty::Foreign(_) | ty::Foreign(_)
| ty::Projection(_)
| ty::Infer(_) => { | ty::Infer(_) => {
unreachable!(); unreachable!();
} }
@ -1165,6 +1166,7 @@ fn confirm_const_drop_candidate(
obligation.param_env, obligation.param_env,
cause.clone(), cause.clone(),
obligation.recursion_depth + 1, obligation.recursion_depth + 1,
// Rebinding here (*)
self_ty self_ty
.rebind(ty::TraitPredicate { .rebind(ty::TraitPredicate {
trait_ref: ty::TraitRef { trait_ref: ty::TraitRef {