Auto merge of #118685 - compiler-errors:stack-dependent, r=lcnr
`EvaluatedToUnknown` -> `EvaluatedToAmbigStackDependent`, `EvaluatedToRecur` -> `EvaluatedToErrStackDependent` Less confusing names, since the only difference between them and their parallel `EvalutedTo..` is that they are stack dependent. r? lcnr
This commit is contained in:
@@ -222,8 +222,8 @@ pub enum TreatInductiveCycleAs {
|
||||
impl From<TreatInductiveCycleAs> for EvaluationResult {
|
||||
fn from(treat: TreatInductiveCycleAs) -> EvaluationResult {
|
||||
match treat {
|
||||
TreatInductiveCycleAs::Ambig => EvaluatedToUnknown,
|
||||
TreatInductiveCycleAs::Recur => EvaluatedToRecur,
|
||||
TreatInductiveCycleAs::Ambig => EvaluatedToAmbigStackDependent,
|
||||
TreatInductiveCycleAs::Recur => EvaluatedToErrStackDependent,
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1231,7 +1231,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
|
||||
})
|
||||
{
|
||||
debug!("evaluate_stack --> unbound argument, recursive --> giving up",);
|
||||
return Ok(EvaluatedToUnknown);
|
||||
return Ok(EvaluatedToAmbigStackDependent);
|
||||
}
|
||||
|
||||
match self.candidate_from_obligation(stack) {
|
||||
|
||||
Reference in New Issue
Block a user