bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

show unit output when there is only output diff in diagnostics

Browse source
This commit is contained in:
yukang 2024-07-06 16:41:16 +08:00
parent 28cc0b643d
commit f46c4129e0
7 changed files with 46 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1168,14 +1168,21 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
let output1 = sig1.output();
let output2 = sig2.output();
let (x1, x2) = self.cmp(output1, output2);
if !output1.is_unit() {
let only_output_diff = !lifetime_diff
&& sig1.c_variadic == sig2.c_variadic
&& sig1.safety == sig2.safety
&& sig1.abi == sig2.abi
&& sig1.inputs() == sig2.inputs()
&& x1 != x2;
if !output1.is_unit() || only_output_diff {
values.0.push_normal(" -> ");
(values.0).0.extend(x1.0);
}
if !output2.is_unit() {
if !output2.is_unit() || only_output_diff {
values.1.push_normal(" -> ");
(values.1).0.extend(x2.0);
}
values
}