Skip to content

Commit 34af00d

Browse files
authored
Unrolled build for rust-lang#118945
Rollup merge of rust-lang#118945 - Enselic:remove-trailing, r=compiler-errors rustc_codegen_ssa: Remove trailing spaces in Display impl for CguReuse Otherwise errors will look like this: error: CGU-reuse for `cgu_invalidated_via_import-bar` is `PreLto ` but should be `PostLto ` ### Background I noticed that error messages looked wonky while investigating if https://github.com/rust-lang/rust/blob/529047cfc3f4f7b3ea5aaac054408f368d153727/compiler/rustc_codegen_ssa/src/assert_module_sources.rs#L281-L287 should not be wrapped by `sess.emit_err(...)`. Right now it looks like the error is accidentally ignored. It looks like rust-lang@706452e might have accidentally started ignoring it (by removing the `diag.span_err()` call). I am still investigating, but regardless of the outcome we should fix the trailing whitespace.
2 parents 740cea8 + 2ddd8b4 commit 34af00d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

compiler/rustc_codegen_ssa/src/assert_module_sources.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,8 @@ impl fmt::Display for CguReuse {
199199
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
200200
match *self {
201201
CguReuse::No => write!(f, "No"),
202-
CguReuse::PreLto => write!(f, "PreLto "),
203-
CguReuse::PostLto => write!(f, "PostLto "),
202+
CguReuse::PreLto => write!(f, "PreLto"),
203+
CguReuse::PostLto => write!(f, "PostLto"),
204204
}
205205
}
206206
}

0 commit comments

Comments
 (0)