Skip to content

Commit 32e5d86

Browse files
committed
Auto merge of #120491 - GuillaumeGomez:rollup-94wj681, r=GuillaumeGomez
Rollup of 18 pull requests Successful merges: - #119123 (Add triagebot mentions entry for simd intrinsics) - #119991 (Reject infinitely-sized reads from io::Repeat) - #120172 (bootstrap: add more unit tests) - #120250 (rustdoc: Prevent JS injection from localStorage) - #120376 (Update codegen test for LLVM 18) - #120387 (interpret/memory: fix safety comment for large array memset optimization) - #120400 (Bound errors span label cleanup) - #120402 (Make the coroutine def id of an async closure the child of the closure def id) - #120403 (Add instructions of how to use pre-vendored 'rustc-src') - #120424 (raw pointer metadata API: data address -> data pointer) - #120425 (Remove unnecessary unit returns in query declarations) - #120439 (Move UI issue tests to subdirectories) - #120443 (Fixes footnote handling in rustdoc) - #120452 (std: Update documentation of seek_write on Windows) - #120460 (Be more careful about interpreting a label/lifetime as a mistyped char literal.) - #120464 (Add matthewjasper to some review groups) - #120467 (Update books) - #120488 (Diagnostic lifetimes cleanups) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 5475680 + 4ec4bdc commit 32e5d86

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/diagnostics.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ impl MachineStopType for TerminationInfo {
104104
self: Box<Self>,
105105
_: &mut dyn FnMut(
106106
std::borrow::Cow<'static, str>,
107-
rustc_errors::DiagnosticArgValue<'static>,
107+
rustc_errors::DiagnosticArgValue,
108108
),
109109
) {
110110
}

0 commit comments

Comments
 (0)