update NotConstEvaluatable

Author: b-naber

compiler/rustc_middle/src/thir/abstract_const.rs

@@ -1,5 +1,6 @@
 //! A subset of a mir body used for const evaluatability checking.
 use crate::mir;
+use crate::mir::interpret::GlobalId;
 use crate::ty::{self, Ty, TyCtxt};
 use rustc_errors::ErrorReported;
 
@@ -30,20 +31,21 @@ pub enum Node<'tcx> {
 }
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq, HashStable, TyEncodable, TyDecodable)]
-pub enum NotConstEvaluatable {
+pub enum NotConstEvaluatable<'tcx> {
     Error(ErrorReported),
     MentionsInfer,
     MentionsParam,
+    Silent(GlobalId<'tcx>),
 }
 
-impl From<ErrorReported> for NotConstEvaluatable {
-    fn from(e: ErrorReported) -> NotConstEvaluatable {
+impl<'tcx> From<ErrorReported> for NotConstEvaluatable<'tcx> {
+    fn from(e: ErrorReported) -> NotConstEvaluatable<'tcx> {
         NotConstEvaluatable::Error(e)
     }
 }
 
 TrivialTypeFoldableAndLiftImpls! {
-    NotConstEvaluatable,
+    NotConstEvaluatable<'tcx>,
 }
 
 impl<'tcx> TyCtxt<'tcx> {

compiler/rustc_middle/src/traits/mod.rs

@@ -456,7 +456,7 @@ pub struct DerivedObligationCause<'tcx> {
     pub parent_code: Lrc<ObligationCauseCode<'tcx>>,
 }
 
-#[derive(Clone, Debug, TypeFoldable, Lift)]
+#[derive(Clone, Debug, TypeFoldable)]
 pub enum SelectionError<'tcx> {
     /// The trait is not implemented.
     Unimplemented,
@@ -471,7 +471,7 @@ pub enum SelectionError<'tcx> {
     /// The trait pointed by `DefId` is not object safe.
     TraitNotObjectSafe(DefId),
     /// A given constant couldn't be evaluated.
-    NotConstEvaluatable(NotConstEvaluatable),
+    NotConstEvaluatable(NotConstEvaluatable<'tcx>),
     /// Exceeded the recursion depth during type projection.
     Overflow,
     /// Signaling that an error has already been emitted, to avoid