bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #100437 - compiler-errors:better-const-mismatch-err, r=oli-obk

Browse source 
Improve const mismatch `FulfillmentError`

Fixes #100414
This commit is contained in:
Matthias Krüger 2022-08-29 06:34:44 +02:00 • committed by GitHub
commit 26c86c6993
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 194 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/rustc_infer/src/infer/error_reporting/mod.rs
View file

@ -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) {