rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Rollup merge of #127417 - chenyukang:yukang-method-output-diff, r=oli-obk

Browse Source 
Show fnsig's unit output  explicitly when there is output diff in diagnostics

Fixes #127263
This commit is contained in:
Michael Goulet
2024-07-06 14:55:25 -04:00
committed by GitHub
parent 9352026d26 81c86ddf8e
commit 413345c61d
12 changed files with 48 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/rustc_infer/src/infer/error_reporting/mod.rs
View File

@@ -1168,14 +1168,16 @@ 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 output_diff = x1 != x2;
if !output1.is_unit() || output_diff {
values.0.push_normal(" -> ");
(values.0).0.extend(x1.0);
}
if !output2.is_unit() {
if !output2.is_unit() || output_diff {
values.1.push_normal(" -> ");
(values.1).0.extend(x2.0);
}
values
}