diff options
| author | Eric Holk <ericholk@microsoft.com> | 2022-02-09 10:53:40 -0800 |
|---|---|---|
| committer | Eric Holk <ericholk@microsoft.com> | 2022-03-07 08:47:18 -0800 |
| commit | 8fc835831c1a84ba27d8bbafec480f02b2e29663 (patch) | |
| tree | 77b52a87c9f3dffef165e72a93a56967cdae1495 /compiler | |
| parent | 7723506d13a03e3191d407aaf3709f157bf75193 (diff) | |
| download | rust-8fc835831c1a84ba27d8bbafec480f02b2e29663.tar.gz rust-8fc835831c1a84ba27d8bbafec480f02b2e29663.zip | |
Update tests after feature stabilization
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/rustc_const_eval/src/transform/check_consts/check.rs | 16 | ||||
| -rw-r--r-- | compiler/rustc_const_eval/src/transform/check_consts/ops.rs | 43 |
2 files changed, 0 insertions, 59 deletions
diff --git a/compiler/rustc_const_eval/src/transform/check_consts/check.rs b/compiler/rustc_const_eval/src/transform/check_consts/check.rs index e5d7560e349..fc53f2785ca 100644 --- a/compiler/rustc_const_eval/src/transform/check_consts/check.rs +++ b/compiler/rustc_const_eval/src/transform/check_consts/check.rs @@ -359,22 +359,6 @@ impl<'mir, 'tcx> Checker<'mir, 'tcx> { match *ty.kind() { ty::Ref(_, _, hir::Mutability::Mut) => self.check_op(ops::ty::MutRef(kind)), ty::Opaque(..) => self.check_op(ops::ty::ImplTrait), - - ty::Dynamic(preds, _) => { - for pred in preds.iter() { - match pred.skip_binder() { - ty::ExistentialPredicate::AutoTrait(_) - | ty::ExistentialPredicate::Projection(_) => { - self.check_op(ops::ty::DynTrait(kind)) - } - ty::ExistentialPredicate::Trait(trait_ref) => { - if Some(trait_ref.def_id) != self.tcx.lang_items().sized_trait() { - self.check_op(ops::ty::DynTrait(kind)) - } - } - } - } - } _ => {} } } diff --git a/compiler/rustc_const_eval/src/transform/check_consts/ops.rs b/compiler/rustc_const_eval/src/transform/check_consts/ops.rs index be6a54c05b7..00c28fef5d2 100644 --- a/compiler/rustc_const_eval/src/transform/check_consts/ops.rs +++ b/compiler/rustc_const_eval/src/transform/check_consts/ops.rs @@ -817,49 +817,6 @@ pub mod ty { } } - #[derive(Debug)] - pub struct DynTrait(pub mir::LocalKind); - impl<'tcx> NonConstOp<'tcx> for DynTrait { - fn importance(&self) -> DiagnosticImportance { - match self.0 { - mir::LocalKind::Var | mir::LocalKind::Temp => DiagnosticImportance::Secondary, - mir::LocalKind::ReturnPointer | mir::LocalKind::Arg => { - DiagnosticImportance::Primary - } - } - } - - fn status_in_item(&self, ccx: &ConstCx<'_, 'tcx>) -> Status { - if ccx.const_kind() != hir::ConstContext::ConstFn { - Status::Allowed - } else { - Status::Unstable(sym::const_fn_trait_bound) - } - } - - fn build_error( - &self, - ccx: &ConstCx<'_, 'tcx>, - span: Span, - ) -> DiagnosticBuilder<'tcx, ErrorGuaranteed> { - let mut err = feature_err( - &ccx.tcx.sess.parse_sess, - sym::const_fn_trait_bound, - span, - "trait objects in const fn are unstable", - ); - - match ccx.fn_sig() { - Some(fn_sig) if !fn_sig.span.contains(span) => { - err.span_label(fn_sig.span, "function declared as const here"); - } - _ => {} - } - - err - } - } - /// A trait bound with the `?const Trait` opt-out #[derive(Debug)] pub struct TraitBoundNotConst; |
