Call them constants instead of types

2022-08-12 02:00:37 +00:00 · 2022-08-12 02:00:37 +00:00 · 4e976262a1
commit 4e976262a1
parent 4a24f08ba4
12 changed files with 47 additions and 42 deletions
--- a/compiler/rustc_infer/src/infer/error_reporting/mod.rs
+++ b/compiler/rustc_infer/src/infer/error_reporting/mod.rs
@ -1588,9 +1588,14 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
                            Mismatch::Variable(infer::ExpectedFound { expected, found }),
                        )
                    }
+                    ValuePairs::Terms(infer::ExpectedFound {
+                        expected: ty::Term::Const(_),
+                        found: ty::Term::Const(_),
+                    }) => (false, Mismatch::Fixed("constant")),
                    ValuePairs::TraitRefs(_) | ValuePairs::PolyTraitRefs(_) => {
                        (false, Mismatch::Fixed("trait"))
                    }
+                    ValuePairs::Regions(_) => (false, Mismatch::Fixed("lifetime")),
                    _ => (false, Mismatch::Fixed("type")),
                };
                let vals = match self.values_str(values) {